cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed progress dialog not shown after enable orbot dialog

Browse Source
This commit is contained in:
Adithya Abraham Philip
2015-07-08 18:39:02 +05:30
parent a038a038c3
commit ce3777eafb
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
View File

@@ -110,7 +110,16 @@ public class ImportKeysProxyActivity extends FragmentActivity
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (mImportOpHelper != null) {
mImportOpHelper.handleActivityResult(requestCode, resultCode, data);
if (!mImportOpHelper.handleActivityResult(requestCode, resultCode, data)) {
// if a result has been returned, and it does not belong to mImportOpHelper,
// return it down to other activity
if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
returnResult(data);
} else {
super.onActivityResult(requestCode, resultCode, data);
finish();
}
}
}
if (requestCode == IntentIntegratorSupportV4.REQUEST_CODE) {
@@ -128,13 +137,6 @@ public class ImportKeysProxyActivity extends FragmentActivity
return;
}
// if a result has been returned, return it down to other activity
if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
returnResult(data);
} else {
super.onActivityResult(requestCode, resultCode, data);
finish();
}
}
private void processScannedContent(String content) {

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
View File

@@ -171,6 +171,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
// this wasn't meant for us to handle
return false;
} else {
// reset mRequestedCode because we have finished what we started
mRequestedCode = -1;
}
if (resultCode == Activity.RESULT_CANCELED) {