🙅 Bind a WebAPK to its "host" browser.

web_apks/minting_example/src/org/chromium/minting/MainActivity.java

Index: web_apks/minting_example/src/org/chromium/minting/MainActivity.java
diff --git a/web_apks/minting_example/src/org/chromium/minting/MainActivity.java b/web_apks/minting_example/src/org/chromium/minting/MainActivity.java
index 3786495547ae2d020765298738b94bc22e3faba9..06edcbb8e7ea1ab9a70e2883db16aefbf37490dc 100644
--- a/web_apks/minting_example/src/org/chromium/minting/MainActivity.java
+++ b/web_apks/minting_example/src/org/chromium/minting/MainActivity.java
@@ -20,13 +20,14 @@ import android.view.View;
 import android.view.View.OnClickListener;
 
 import org.chromium.minting.lib.common.WebAPKConstants;
+import org.chromium.minting.lib.common.WebAPKUtils;
 
 import java.io.ByteArrayOutputStream;
 
 /**
  * Example client activity for a minted APK.
  */
-public class MainActivity extends Activity implements OnClickListener {
+public class MainActivity extends Activity {
     private static final String EXTRA_ID = "org.chromium.chrome.browser.webapp_id";
     private static final String EXTRA_ICON = "org.chromium.chrome.browser.webapp_icon";
     private static final String EXTRA_NAME = "org.chromium.chrome.browser.webapp_name";
@@ -35,7 +36,6 @@ public class MainActivity extends Activity implements OnClickListener {
     private static final String EXTRA_MAC = "org.chromium.chrome.browser.webapp_mac";
     private static final String EXTRA_SCOPE = "org.chromium.chrome.browser.webapp_scope";
     private static final String EXTRA_MINTING_PACKAGE_NAME = "EXTRA_MINTING_PACKAGE_NAME";
-    private static final String EXTRA_CALLER_PACKAGE_NAME = "EXTRA_CALLER_PACKAGE_NAME";
     private static final String META_DATA_HOST_URL = "hostUrl";
     private static final String META_DATA_MAC = "mac";
     private static final String META_DATA_SCOPE = "scope";
@@ -82,22 +82,8 @@ public class MainActivity extends Activity implements OnClickListener {
             e.printStackTrace();
         }
 
-        SharedPreferences prefs =
-                getSharedPreferences(MintingApplication.MINT_PREFS, MODE_PRIVATE);
-        String chromePackageFromPref = prefs.getString(MintingApplication.HOST_PACKAGE_PREF,
-                MintingApplication.DEFAULT_CHROME_PACKAGE_NAME);
-        String callerPackageName = intent.getStringExtra(EXTRA_CALLER_PACKAGE_NAME);
-        // Update value if needed
-        if (callerPackageName != null && !callerPackageName.equals(chromePackageFromPref)) {
-            prefs.edit().putString(MintingApplication.HOST_PACKAGE_PREF, callerPackageName)
-                    .apply();
-            Log.d(TAG, "Chrome with package " + callerPackageName + " is new host");
-        }
-        String chromePackageName = callerPackageName == null ? chromePackageFromPref :
-                callerPackageName;
-
         Intent newIntent = new Intent();
-        newIntent.setComponent(new ComponentName(chromePackageName,
+        newIntent.setComponent(new ComponentName(WebAPKUtils.getHostBrowserPackageName(this),
                 "org.chromium.chrome.browser.webapps.WebappLauncherActivity"));
         newIntent.putExtra(EXTRA_ID, webappId);
         newIntent.putExtra(EXTRA_NAME, name);
@@ -111,14 +97,11 @@ public class MainActivity extends Activity implements OnClickListener {
         finish();
     }
 
-    @Override
-    public void onClick(View v) {
-
-    }
 
     /**
      * Compresses a bitmap into a PNG and converts into a Base64 encoded string.
      * The encoded string can be decoded using {@link decodeBitmapFromString(String)}.
+     *

[Xi Han, 2016/04/15 14:46:49]

Revert?

[Yaron, 2016/04/15 15:46:58]

Done.

      * @param bitmap The Bitmap to compress and encode.
      * @return the String encoding the Bitmap.
      */
@@ -131,6 +114,7 @@ public class MainActivity extends Activity implements OnClickListener {
 
     /**
      * Returns whether a url is valid.
+     *

[Xi Han, 2016/04/15 14:46:49]

Please revert.

[Yaron, 2016/04/15 15:46:58]

Done.

      * @param url The url to check.
      * @return Whether the url is valid.
      */