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

Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-10-04 23:31:04 +02:00
parent f96f289891 4fcd58b9f8
commit 4b372a5c33
3 changed files with 146 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java
View File

@@ -384,9 +384,9 @@ public class AddKeysActivity extends ActionBarActivity implements
}
finish();
Intent certifyIntent = new Intent(); // TODO: certify
Intent certifyIntent = new Intent(AddKeysActivity.this, MultiCertifyKeyActivity.class);
certifyIntent.putExtra(ImportKeyResult.EXTRA_RESULT, result);
certifyIntent.putExtra("key ids", result.getImportedMasterKeyIds()); // TODO: extra
certifyIntent.putExtra(MultiCertifyKeyActivity.EXTRA_KEY_IDS, result.getImportedMasterKeyIds());
startActivity(certifyIntent);
result.createNotify(AddKeysActivity.this).show();