moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 11:42:16 -05:00
Code Issues Releases Wiki Activity

Rename method

Browse Source 
Since the crypto code no longer lives in MessageViewFragment it shouldn't
make references to what happens after its work is done.
This commit is contained in:
cketti 2015-02-09 18:48:48 +01:00
parent 5c036e2991
commit 948cb971ad
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoHelper.java
View File

@ -87,7 +87,7 @@ public class MessageCryptoHelper {
partsToDecryptOrVerify.addAll(encryptedParts);
partsToDecryptOrVerify.addAll(signedParts);
partsToDecryptOrVerify.addAll(inlineParts);
decryptOrVerifyNextPartOrStartExtractingTextAndAttachments();
decryptOrVerifyNextPart();
} else {
returnResultToFragment();
}
@ -97,7 +97,7 @@ public class MessageCryptoHelper {
return !TextUtils.isEmpty(account.getCryptoApp());
}
private void decryptOrVerifyNextPartOrStartExtractingTextAndAttachments() {
private void decryptOrVerifyNextPart() {
if (partsToDecryptOrVerify.isEmpty()) {
returnResultToFragment();
return;
@ -115,7 +115,7 @@ public class MessageCryptoHelper {
startDecryptingOrVerifyingPart(part);
} else {
partsToDecryptOrVerify.removeFirst();
decryptOrVerifyNextPartOrStartExtractingTextAndAttachments();
decryptOrVerifyNextPart();
}
}
@ -139,7 +139,7 @@ public class MessageCryptoHelper {
public void onBound(IOpenPgpService service) {
openPgpApi = new OpenPgpApi(fragment.getContext(), service);
decryptOrVerifyNextPartOrStartExtractingTextAndAttachments();
decryptOrVerifyNextPart();
}
@Override
@ -387,7 +387,7 @@ public class MessageCryptoHelper {
public void handleCryptoResult(int resultCode, Intent data) {
if (resultCode == Activity.RESULT_OK) {
decryptOrVerifyNextPartOrStartExtractingTextAndAttachments();
decryptOrVerifyNextPart();
} else {
// FIXME: don't pass null
onCryptoFailed(null);
@ -412,7 +412,7 @@ public class MessageCryptoHelper {
private void onCryptoFinished() {
partsToDecryptOrVerify.removeFirst();
decryptOrVerifyNextPartOrStartExtractingTextAndAttachments();
decryptOrVerifyNextPart();
}
private void returnResultToFragment() {