Improved import with preview of keyrings

2013-01-08 17:01:45 +01:00
parent 6cc7156fbd
commit 68039d3a8a
17 changed files with 451 additions and 183 deletions
--- a/APG/src/org/thialfihar/android/apg/ui/ShareQrCodeActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/ShareQrCodeActivity.java
@@ -49,7 +49,7 @@ public class ShareQrCodeActivity extends SherlockFragmentActivity {
        }

        if (ACTION_SHARE_WITH_QR_CODE.equals(action)) {
-            long masterKeyId = getIntent().getExtras().getLong(EXTRA_MASTER_KEY_ID);
+            long masterKeyId = extras.getLong(EXTRA_MASTER_KEY_ID);

            // get public keyring as ascii armored string
            ArrayList<String> keyringArmored = ProviderHelper.getPublicKeyRingsAsArmoredString(