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

fixed QR code scan and serialKeyImport progress

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

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java
View File

@@ -155,7 +155,9 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
public ImportKeyResult serialKeyRingImport(Iterator<ParcelableKeyRing> entries, int num, public ImportKeyResult serialKeyRingImport(Iterator<ParcelableKeyRing> entries, int num,
String keyServerUri, Progressable progressable, String keyServerUri, Progressable progressable,
Proxy proxy) { Proxy proxy) {
updateProgress(R.string.progress_importing, 0, 100); if (progressable != null) {
progressable.setProgress(R.string.progress_importing, 0, 100);
}
OperationLog log = new OperationLog(); OperationLog log = new OperationLog();
log.add(LogType.MSG_IMPORT, 0, num); log.add(LogType.MSG_IMPORT, 0, num);

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

@@ -110,7 +110,7 @@ public class ImportKeysProxyActivity extends FragmentActivity
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (mImportOpHelper != null) { if (mImportOpHelper != null) {
mImportOpHelper.cryptoOperation(); mImportOpHelper.handleActivityResult(requestCode, resultCode, data);
} }
if (requestCode == IntentIntegratorSupportV4.REQUEST_CODE) { if (requestCode == IntentIntegratorSupportV4.REQUEST_CODE) {