Dont cache activity for external navigation handling

chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.externalnav;
 
 import android.Manifest.permission;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
@@ skipping 23 matching lines @@
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.common.Referrer;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.base.WindowAndroid.PermissionCallback;
 
 import java.util.List;
 
 /**
  * The main implementation of the {@link ExternalNavigationDelegate}.
  */
 public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegate {
     private static final String TAG = "ExternalNavigationDelegateImpl";
     private static final String PDF_VIEWER = "com.google.android.apps.docs";
     private static final String PDF_MIME = "application/pdf";
     private static final String PDF_SUFFIX = ".pdf";
-    private final ChromeActivity mActivity;
+    private final Tab mTab;
+    protected final Context mApplicationContext;
 
-    public ExternalNavigationDelegateImpl(ChromeActivity activity) {
-        mActivity = activity;
+    public ExternalNavigationDelegateImpl(Tab tab) {
+        mTab = tab;
+        // At the point of creation the tab should have a valid WindowAndroid.

[gone, 2016/01/25 23:42:43]

Add an assert?

[Yusuf, 2016/01/25 23:55:59]

Done.

+        mApplicationContext = tab.getWindowAndroid().getContext().get().getApplicationContext();
     }
 
     /**
-     * @return The activity that this delegate is associated with.
+     * @return The activity {@link Context} if it can be reached.

[gone, 2016/01/25 23:42:43]

nit: Explicitly specify when you'd need this function.  Rename it; saying
IfAvailable implies that it'd return null.

[Yusuf, 2016/01/25 23:55:59]

Done.

+     *         Application {@link Context} if not.
      */
-    protected final Activity getActivity() {
-        return mActivity;
+    protected final Context getActivityContextIfAvailable() {
+        if (mTab.getWindowAndroid() == null) return mApplicationContext;
+        Context activityContext = WindowAndroid.activityFromContext(
+                mTab.getWindowAndroid().getContext().get());
+        if (activityContext == null) return mApplicationContext;
+        return activityContext;
     }
 
     /**
      * If the intent is for a pdf, resolves intent handlers to find the platform pdf viewer if
      * it is available and force is for the provided |intent| so that the user doesn't need to
      * choose it from Intent picker.
      *
      * @param context Context of the app.
      * @param intent Intent to open.
      */
@@ skipping 105 matching lines @@
             return info != null
                     && info.activityInfo.packageName.equals(context.getPackageName());
         } catch (RuntimeException e) {
             logTransactionTooLargeOrRethrow(e, intent);
             return false;
         }
     }
 
     @Override
     public List<ComponentName> queryIntentActivities(Intent intent) {
-        return IntentUtils.getIntentHandlers(mActivity, intent);
+        return IntentUtils.getIntentHandlers(mApplicationContext, intent);
     }
 
     @Override
     public boolean willChromeHandleIntent(Intent intent) {
-        return willChromeHandleIntent(mActivity, intent, false);
+        return willChromeHandleIntent(mApplicationContext, intent, false);
     }
 
     @Override
     public boolean isSpecializedHandlerAvailable(Intent intent) {
-        return isPackageSpecializedHandler(mActivity, null, intent);
+        return isPackageSpecializedHandler(mApplicationContext, null, intent);
     }
 
     /**
      * Check whether the given package is a specialized handler for the given intent
      *
      * @param context {@link Context} to use for getting the {@link PackageManager}.
      * @param packageName Package name to check against. Can be null or empty.
      * @param intent The intent to resolve for.
      * @return Whether the given package is a specialized handler for the given intent. If there is
      *         no package name given checks whether there is any specialized handler.
@@ skipping 22 matching lines @@
                 return true;
             }
         } catch (RuntimeException e) {
             logTransactionTooLargeOrRethrow(e, intent);
         }
         return false;
     }
 
     @Override
     public String getPackageName() {
-        return mActivity.getPackageName();
+        return mApplicationContext.getPackageName();
     }
 
     @Override
     public void startActivity(Intent intent) {
         try {
-            forcePdfViewerAsIntentHandlerIfNeeded(mActivity, intent);
-            mActivity.startActivity(intent);
+            forcePdfViewerAsIntentHandlerIfNeeded(mApplicationContext, intent);
+            Context context = getActivityContextIfAvailable();
+            if (!(context instanceof Activity)) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(intent);
         } catch (RuntimeException e) {
             logTransactionTooLargeOrRethrow(e, intent);
         }
     }
 
     @Override
     public boolean startActivityIfNeeded(Intent intent) {
         try {
-            forcePdfViewerAsIntentHandlerIfNeeded(mActivity, intent);
-            return mActivity.startActivityIfNeeded(intent, -1);
+            forcePdfViewerAsIntentHandlerIfNeeded(mApplicationContext, intent);
+            Context context = getActivityContextIfAvailable();
+            if (!(context instanceof Activity)) return false;
+            return ((Activity) context).startActivityIfNeeded(intent, -1);

[gone, 2016/01/25 23:42:43]

if (context instanceof Activity) {
    return ((Activity) context).startActivityIfNeeded(intent, -1);
} else {
    return false;
}

[Yusuf, 2016/01/25 23:55:59]

Done.

         } catch (RuntimeException e) {
             logTransactionTooLargeOrRethrow(e, intent);
             return false;
         }
     }
 
     @Override
     public void startIncognitoIntent(final Intent intent, final String referrerUrl,
             final String fallbackUrl, final Tab tab, final boolean needsToCloseTab) {
-        new AlertDialog.Builder(mActivity, R.style.AlertDialogTheme)
+        Context context = tab.getWindowAndroid().getContext().get();
+        if (!(context instanceof Activity)) return;

[gone, 2016/01/25 23:42:43]

nit newline

[Yusuf, 2016/01/25 23:55:59]

Done.

+        Activity activity = (Activity) context;
+        new AlertDialog.Builder(activity, R.style.AlertDialogTheme)
             .setTitle(R.string.external_app_leave_incognito_warning_title)
             .setMessage(R.string.external_app_leave_incognito_warning)
             .setPositiveButton(R.string.ok, new OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         startActivity(intent);
                         if (tab != null && !tab.isClosing() && tab.isInitialized()
                                 && needsToCloseTab) {
                             closeTab(tab);
                         }
@@ skipping 14 matching lines @@
             .show();
     }
 
     @Override
     public boolean shouldRequestFileAccess(String url, Tab tab) {
         // If the tab is null, then do not attempt to prompt for access.
         if (tab == null) return false;
 
         // If the url points inside of Chromium's data directory, no permissions are necessary.
         // This is required to prevent permission prompt when uses wants to access offline pages.
-        if (url.startsWith("file://" + PathUtils.getDataDirectory(
-                mActivity.getApplicationContext()))) {
+        if (url.startsWith("file://" + PathUtils.getDataDirectory(mApplicationContext))) {
             return false;
         }
 
         return !tab.getWindowAndroid().hasPermission(permission.WRITE_EXTERNAL_STORAGE)
                 && tab.getWindowAndroid().canRequestPermission(permission.WRITE_EXTERNAL_STORAGE);
     }
 
     @Override
     public void startFileIntent(final Intent intent, final String referrerUrl, final Tab tab,
             final boolean needsToCloseTab) {
@@ skipping 33 matching lines @@
             return;
         }
 
         if (needsToStartIntent) {
             intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
             intent.putExtra(Browser.EXTRA_APPLICATION_ID, getPackageName());
             if (launchIncogntio) intent.putExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, true);
             intent.addCategory(Intent.CATEGORY_BROWSABLE);
             intent.setClassName(getPackageName(), ChromeLauncherActivity.class.getName());
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            IntentHandler.addTrustedIntentExtras(intent, mActivity);
+            IntentHandler.addTrustedIntentExtras(intent, mApplicationContext);
             startActivity(intent);
 
             if (needsToCloseTab) closeTab(tab);
             return;
         }
 
         LoadUrlParams loadUrlParams = new LoadUrlParams(url, PageTransition.AUTO_TOPLEVEL);
         if (!TextUtils.isEmpty(referrerUrl)) {
             Referrer referrer = new Referrer(referrerUrl, Referrer.REFERRER_POLICY_ALWAYS);
             loadUrlParams.setReferrer(referrer);
@@ skipping 26 matching lines @@
     }
 
     @Override
     public boolean isChromeAppInForeground() {
         return ApplicationStatus.getStateForApplication()
                 == ApplicationState.HAS_RUNNING_ACTIVITIES;
     }
 
     @Override
     public boolean isDocumentMode() {
-        return FeatureUtilities.isDocumentMode(mActivity);
+        return FeatureUtilities.isDocumentMode(mApplicationContext);
     }
 
     @Override
     public String getDefaultSmsPackageName() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return null;
-        return Telephony.Sms.getDefaultSmsPackage(mActivity);
+        return Telephony.Sms.getDefaultSmsPackage(mApplicationContext);
     }
 
     private static void logTransactionTooLargeOrRethrow(RuntimeException e, Intent intent) {
         // See http://crbug.com/369574.
         if (e.getCause() instanceof TransactionTooLargeException) {
             Log.e(TAG, "Could not resolve Activity for intent " + intent.toString(), e);
         } else {
             throw e;
         }
     }
 
     private void closeTab(Tab tab) {
-        mActivity.getTabModelSelector().closeTab(tab);
+        Context context = tab.getWindowAndroid().getContext().get();
+        if (!(context instanceof ChromeActivity)) return;

[gone, 2016/01/25 23:42:43]

if (context instanceof ChromeActivity) {
    ((ChromeActivity) context).getTabModelSelector().closeTab(tab);
}

[Yusuf, 2016/01/25 23:55:59]

Done.

+        ((ChromeActivity) context).getTabModelSelector().closeTab(tab);
     }
 }