From ec3459733180a5d83805b6fe9ddf5571f7b0380f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 26 Mar 2014 14:11:28 +0100
Subject: Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOT

---
 OpenPGP-Keychain/src/main/AndroidManifest.xml      |  6 +--
 .../keychain/remote/OpenPgpService.java            | 29 ++++++-------
 .../keychain/remote/RemoteService.java             | 24 ++++++-----
 .../keychain/remote/ui/AppSettingsFragment.java    | 47 ++++++++++------------
 .../keychain/remote/ui/RemoteServiceActivity.java  |  1 +
 5 files changed, 53 insertions(+), 54 deletions(-)

(limited to 'OpenPGP-Keychain')

diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml
index 142174749..e6a082743 100644
--- a/OpenPGP-Keychain/src/main/AndroidManifest.xml
+++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml
@@ -384,9 +384,9 @@
         <activity
             android:name=".remote.ui.RemoteServiceActivity"
             android:exported="false"
-            android:label="@string/app_name" />
-        <!--android:launchMode="singleTop"-->
-        <!--android:process=":remote_api"-->
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:process=":remote_api" />
         <activity
             android:name=".remote.ui.AppsListActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index fa6ccf63b..ad0c658ad 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -23,6 +23,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
+
 import org.openintents.openpgp.IOpenPgpService;
 import org.openintents.openpgp.OpenPgpError;
 import org.openintents.openpgp.OpenPgpSignatureResult;
@@ -47,10 +48,6 @@ import java.util.ArrayList;
 
 public class OpenPgpService extends RemoteService {
 
-    private static final int PRIVATE_REQUEST_CODE_PASSPHRASE = 551;
-    private static final int PRIVATE_REQUEST_CODE_USER_IDS = 552;
-    private static final int PRIVATE_REQUEST_CODE_GET_KEYS = 553;
-
     /**
      * Search database for key ids based on emails.
      *
@@ -100,8 +97,9 @@ public class OpenPgpService extends RemoteService {
             intent.putExtra(RemoteServiceActivity.EXTRA_DUBLICATE_USER_IDS, dublicateUserIds);
             intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data);
 
-            PendingIntent pi = PendingIntent.getActivity
-                    (getBaseContext(), PRIVATE_REQUEST_CODE_USER_IDS, intent, 0);
+            PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
+                    intent,
+                    PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
 
             // return PendingIntent to be executed by client
             Intent result = new Intent();
@@ -127,8 +125,9 @@ public class OpenPgpService extends RemoteService {
         intent.putExtra(RemoteServiceActivity.EXTRA_SECRET_KEY_ID, keyId);
         // pass params through to activity that it can be returned again later to repeat pgp operation
         intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data);
-        PendingIntent pi = PendingIntent.getActivity
-                            (getBaseContext(), PRIVATE_REQUEST_CODE_PASSPHRASE, intent, 0);
+        PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
+                intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
 
         // return PendingIntent to be executed by client
         Intent result = new Intent();
@@ -211,7 +210,7 @@ public class OpenPgpService extends RemoteService {
                 Intent result = new Intent();
                 result.putExtra(OpenPgpApi.RESULT_ERROR,
                         new OpenPgpError(OpenPgpError.GENERIC_ERROR,
-                                        "Missing parameter user_ids or key_ids!"));
+                                "Missing parameter user_ids or key_ids!"));
                 result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);
                 return result;
             }
@@ -318,8 +317,9 @@ public class OpenPgpService extends RemoteService {
                         intent.putExtra(RemoteServiceActivity.EXTRA_ERROR_MESSAGE, "todo");
                         intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data);
 
-                        PendingIntent pi = PendingIntent.getActivity(getBaseContext(),
-                                PRIVATE_REQUEST_CODE_GET_KEYS, intent, 0);
+                        PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
+                                intent,
+                                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
 
                         result.putExtra(OpenPgpApi.RESULT_INTENT, pi);
                     }
@@ -358,8 +358,9 @@ public class OpenPgpService extends RemoteService {
                 intent.putExtra(RemoteServiceActivity.EXTRA_ERROR_MESSAGE, "todo");
                 intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data);
 
-                PendingIntent pi = PendingIntent.getActivity(getBaseContext(),
-                        PRIVATE_REQUEST_CODE_GET_KEYS, intent, 0);
+                PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
+                        intent,
+                        PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
 
                 result.putExtra(OpenPgpApi.RESULT_INTENT, pi);
                 result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED);
@@ -408,7 +409,7 @@ public class OpenPgpService extends RemoteService {
         if (data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) != OpenPgpApi.API_VERSION) {
             Intent result = new Intent();
             OpenPgpError error = new OpenPgpError
-                        (OpenPgpError.INCOMPATIBLE_API_VERSIONS, "Incompatible API versions!");
+                    (OpenPgpError.INCOMPATIBLE_API_VERSIONS, "Incompatible API versions!");
             result.putExtra(OpenPgpApi.RESULT_ERROR, error);
             result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);
             return result;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
index 7e935d317..8cea3cd21 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
@@ -46,9 +46,6 @@ import java.util.Arrays;
 public abstract class RemoteService extends Service {
     Context mContext;
 
-    private static final int PRIVATE_REQUEST_CODE_REGISTER = 651;
-    private static final int PRIVATE_REQUEST_CODE_ERROR = 652;
-
     public Context getContext() {
         return mContext;
     }
@@ -59,6 +56,7 @@ public abstract class RemoteService extends Service {
                 return null;
             } else {
                 String packageName = getCurrentCallingPackage();
+                Log.d(Constants.TAG, "isAllowed packageName: " + packageName);
 
                 byte[] packageSignature;
                 try {
@@ -80,8 +78,9 @@ public abstract class RemoteService extends Service {
                 intent.putExtra(RemoteServiceActivity.EXTRA_PACKAGE_SIGNATURE, packageSignature);
                 intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data);
 
-                PendingIntent pi = PendingIntent.getActivity(getBaseContext(),
-                        PRIVATE_REQUEST_CODE_REGISTER, intent, 0);
+                PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
+                        intent,
+                        PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
 
                 // return PendingIntent to be executed by client
                 Intent result = new Intent();
@@ -99,8 +98,9 @@ public abstract class RemoteService extends Service {
                     getString(R.string.api_error_wrong_signature));
             intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data);
 
-            PendingIntent pi = PendingIntent.getActivity(getBaseContext(),
-                    PRIVATE_REQUEST_CODE_ERROR, intent, 0);
+            PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
+                    intent,
+                    PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
 
             // return PendingIntent to be executed by client
             Intent result = new Intent();
@@ -163,8 +163,9 @@ public abstract class RemoteService extends Service {
         intent.putExtra(RemoteServiceActivity.EXTRA_ACC_NAME, accountName);
         intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data);
 
-        PendingIntent pi = PendingIntent.getActivity(getBaseContext(),
-                PRIVATE_REQUEST_CODE_REGISTER, intent, 0);
+        PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
+                intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
 
         // return PendingIntent to be executed by client
         Intent result = new Intent();
@@ -206,7 +207,7 @@ public abstract class RemoteService extends Service {
             }
         }
 
-        Log.d(Constants.TAG, "Caller is NOT allowed!");
+        Log.d(Constants.TAG, "Uid is NOT allowed!");
         return false;
     }
 
@@ -218,7 +219,7 @@ public abstract class RemoteService extends Service {
      * @throws WrongPackageSignatureException
      */
     private boolean isPackageAllowed(String packageName) throws WrongPackageSignatureException {
-        Log.d(Constants.TAG, "packageName: " + packageName);
+        Log.d(Constants.TAG, "isPackageAllowed packageName: " + packageName);
 
         ArrayList<String> allowedPkgs = ProviderHelper.getRegisteredApiApps(this);
         Log.d(Constants.TAG, "allowed: " + allowedPkgs);
@@ -246,6 +247,7 @@ public abstract class RemoteService extends Service {
             }
         }
 
+        Log.d(Constants.TAG, "Package is NOT allowed! packageName: " + packageName);
         return false;
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
index 5a6151d88..a6db02708 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
@@ -55,20 +55,7 @@ public class AppSettingsFragment extends Fragment {
 
     public void setAppSettings(AppSettings appSettings) {
         this.mAppSettings = appSettings;
-        setPackage(appSettings.getPackageName());
-        mPackageName.setText(appSettings.getPackageName());
-
-        try {
-            MessageDigest md = MessageDigest.getInstance("SHA-256");
-            md.update(appSettings.getPackageSignature());
-            byte[] digest = md.digest();
-            String signature = new String(Hex.encode(digest));
-
-            mPackageSignature.setText(signature);
-        } catch (NoSuchAlgorithmException e) {
-            Log.e(Constants.TAG, "Should not happen!", e);
-        }
-
+        updateView(appSettings);
     }
 
     /**
@@ -77,36 +64,44 @@ public class AppSettingsFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.api_app_settings_fragment, container, false);
-        initView(view);
-        return view;
-    }
-
-
-    private void initView(View view) {
         mAppNameView = (TextView) view.findViewById(R.id.api_app_settings_app_name);
         mAppIconView = (ImageView) view.findViewById(R.id.api_app_settings_app_icon);
-
         mPackageName = (TextView) view.findViewById(R.id.api_app_settings_package_name);
         mPackageSignature = (TextView) view.findViewById(R.id.api_app_settings_package_signature);
+        return view;
     }
 
-    private void setPackage(String packageName) {
-        PackageManager pm = getActivity().getApplicationContext().getPackageManager();
-
+    private void updateView(AppSettings appSettings) {
         // get application name and icon from package manager
         String appName;
         Drawable appIcon = null;
+        PackageManager pm = getActivity().getApplicationContext().getPackageManager();
         try {
-            ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
+            ApplicationInfo ai = pm.getApplicationInfo(appSettings.getPackageName(), 0);
 
             appName = (String) pm.getApplicationLabel(ai);
             appIcon = pm.getApplicationIcon(ai);
         } catch (NameNotFoundException e) {
             // fallback
-            appName = packageName;
+            appName = appSettings.getPackageName();
         }
         mAppNameView.setText(appName);
         mAppIconView.setImageDrawable(appIcon);
+
+        // advanced info: package name
+        mPackageName.setText(appSettings.getPackageName());
+
+        // advanced info: package signature SHA-256
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            md.update(appSettings.getPackageSignature());
+            byte[] digest = md.digest();
+            String signature = new String(Hex.encode(digest));
+
+            mPackageSignature.setText(signature);
+        } catch (NoSuchAlgorithmException e) {
+            Log.e(Constants.TAG, "Should not happen!", e);
+        }
     }
 
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
index d3ac5cade..ba0d4d088 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
@@ -95,6 +95,7 @@ public class RemoteServiceActivity extends ActionBarActivity {
         if (ACTION_REGISTER.equals(action)) {
             final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
             final byte[] packageSignature = extras.getByteArray(EXTRA_PACKAGE_SIGNATURE);
+            Log.d(Constants.TAG, "ACTION_REGISTER packageName: "+packageName);
 
             // Inflate a "Done"/"Cancel" custom action bar view
             ActionBarHelper.setTwoButtonView(getSupportActionBar(),
-- 
cgit v1.2.3