Externalize all import actions into ImportKeysActivity

2013-01-07 15:56:56 +01:00
parent 05778fd482
commit 9758cb673f
15 changed files with 665 additions and 548 deletions
--- a/APG/src/org/thialfihar/android/apg/ui/MainActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/MainActivity.java
@@ -56,9 +56,8 @@ public class MainActivity extends SherlockActivity {
    }

    public void scanQrcodeOnClick(View view) {
-        Intent intent = new Intent(this, ImportFromQRCodeActivity.class);
-        intent.setAction(ImportFromQRCodeActivity.SCAN_QR_CODE);
-        startActivityForResult(intent, Id.request.import_from_qr_code);
+        Intent intent = new Intent(this, ImportKeysActivity.class);
+        startActivityForResult(intent, 0);
    }

    public void helpOnClick(View view) {