cleanup, add SCAN_QR_CODE intent

APG/src/org/thialfihar/android/apg/ui/EditKeyActivity.java

@@ -299,6 +299,7 @@ public class EditKeyActivity extends SherlockFragmentActivity {
      * 
      * @param intent
      */
+    @SuppressWarnings("unchecked")
     private void handleActionEditKey(Intent intent) {
         Bundle extras = intent.getExtras();
 

APG/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java

@@ -46,8 +46,7 @@ import com.google.zxing.integration.android.IntentResult;
 public class ImportFromQRCodeActivity extends SherlockFragmentActivity {
 
     // Not used in sourcode, but listed in AndroidManifest!
-    public static final String IMPORT_FROM_QR_CODE = Constants.INTENT_PREFIX
-            + "IMPORT_FROM_QR_CODE";
+    public static final String SCAN_QR_CODE = Constants.INTENT_PREFIX + "SCAN_QR_CODE";
 
     // public static final String EXTRA_KEY_ID = "keyId";
 

APG/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java

@@ -64,7 +64,7 @@ public class KeyListPublicActivity extends KeyListActivity {
         }
         case Id.menu.option.scanQRCode: {
             Intent intent = new Intent(this, ImportFromQRCodeActivity.class);
-            intent.setAction(ImportFromQRCodeActivity.IMPORT_FROM_QR_CODE);
+            intent.setAction(ImportFromQRCodeActivity.SCAN_QR_CODE);
             startActivityForResult(intent, Id.request.import_from_qr_code);
 
             return true;

APG/src/org/thialfihar/android/apg/ui/MainActivity.java

@@ -57,7 +57,7 @@ public class MainActivity extends SherlockActivity {
 
     public void scanQrcodeOnClick(View view) {
         Intent intent = new Intent(this, ImportFromQRCodeActivity.class);
-        intent.setAction(ImportFromQRCodeActivity.IMPORT_FROM_QR_CODE);
+        intent.setAction(ImportFromQRCodeActivity.SCAN_QR_CODE);
         startActivityForResult(intent, Id.request.import_from_qr_code);
     }