PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

decryptlist: re-decrypt after key lookup

Browse source
This commit is contained in:
Vincent Breitmoser 2015-10-23 18:49:31 +02:00
parent 3b95fea379
commit cf51366bb7
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
View file

@ -459,8 +459,9 @@ public class DecryptListFragment
// un-cancel this one
mCancelledInputUris.remove(uri);
mInputDataResults.remove(uri);
mPendingInputUris.add(uri);
mAdapter.setCancelled(uri, null);
mAdapter.resetItemData(uri);
cryptoOperation();
@ -663,9 +664,7 @@ public class DecryptListFragment
@Override
public void onCryptoOperationSuccess(ImportKeyResult result) {
// TODO trigger new signature check
result.createNotify(getActivity()).show();
mAdapter.setProcessingKeyLookup(inputUri, false);
retryUri(inputUri);
}
@Override
@ -747,7 +746,7 @@ public class DecryptListFragment
mCancelled = null;
}
void addResult(InputDataResult result) {
void setResult(InputDataResult result) {
mResult = result;
}
@ -1033,13 +1032,20 @@ public class DecryptListFragment
}
public void addResult(Uri uri, InputDataResult result) {
ViewModel model = new ViewModel(uri);
int pos = mDataset.indexOf(model);
model = mDataset.get(pos);
model.setResult(result);
notifyItemChanged(pos);
}
model.addResult(result);
public void resetItemData(Uri uri) {
ViewModel model = new ViewModel(uri);
int pos = mDataset.indexOf(model);
model = mDataset.get(pos);
model.setResult(null);
model.setCancelled(null);
model.setProcessingKeyLookup(false);
notifyItemChanged(pos);
}

2
OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
View file

@ -163,6 +163,8 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text=""
android:singleLine="true"
android:ellipsize="end"
tools:text="alice@example.com" />
</LinearLayout>