Fixed issues when browser don't close on Android and getting the response of auth redirection

Author: jdnichollsc

CHANGELOG.md

@@ -22,6 +22,12 @@ in case of vulnerabilities.
 
 ## [Unreleased]
 
+## [3.3.0] - 2019-11-12
+
+### Fixed
+- Removed `waitForRedirectDelay` option and fixed race condition from **Android** to get the response of the redirection ([#36](https://github.com/proyecto26/react-native-inappbrowser/issues/36))
+- Fixed **Android** Activity issue closing the browser and restoring the state by using `onSaveInstanceState` ([#60](https://github.com/proyecto26/react-native-inappbrowser/issues/60)).
+
 ## [3.2.0] - 2019-11-10
 
 ### Added

README.md

@@ -156,7 +156,6 @@ Property       | Description
 `animations` (Object)             | Sets the start and exit animations. [`{ startEnter, startExit, endEnter, endExit }`]
 `headers` (Object)                | The data are key/value pairs, they will be sent in the HTTP request headers for the provided url. [`{ 'Authorization': 'Bearer ...' }`]
 `forceCloseOnRedirection` (Boolean) | Open Custom Tab in a new task to avoid issues redirecting back to app scheme. [`true`/`false`]
-`waitForRedirectDelay` (Number)   | Sets a delay for wait the redirection using `openAuth` method.
 
 ### Demo
 
@@ -197,8 +196,7 @@ import InAppBrowser from 'react-native-inappbrowser-reborn'
           },
           headers: {
             'my-custom-header': 'my custom header value'
-          },
-          waitForRedirectDelay: 0
+          }
         })
         Alert.alert(JSON.stringify(result))
       }
@@ -270,8 +268,7 @@ import { getDeepLink } from './utilities'
           // Android Properties
           showTitle: false,
           enableUrlBarHiding: true,
-          enableDefaultShare: true,
-          waitForRedirectDelay: 1000
+          enableDefaultShare: true
         }).then((response) => {
           if (response.type === 'success' &&
             response.url) {

android/src/main/java/com/proyecto26/inappbrowser/ChromeTabsManagerActivity.java

@@ -15,8 +15,11 @@
  */
 public class ChromeTabsManagerActivity extends Activity {
   static final String KEY_BROWSER_INTENT = "browserIntent";
+  static final String BROWSER_RESULT_TYPE = "browserResultType";
+  static final String DEFAULT_RESULT_TYPE = "dismiss";
 
   private boolean mOpened = false;
+  private String resultType = null;
 
   public static Intent createStartIntent(Context context, Intent authIntent) {
     Intent intent = createBaseIntent(context);
@@ -41,10 +44,13 @@ protected void onCreate(Bundle savedInstanceState) {
     // This activity gets opened in 2 different ways. If the extra KEY_BROWSER_INTENT is present we
     // start that intent and if it is not it means this activity was started with FLAG_ACTIVITY_CLEAR_TOP
     // in order to close the intent that was started previously so we just close this.
-    if (getIntent().hasExtra(KEY_BROWSER_INTENT)) {
+    if (getIntent().hasExtra(KEY_BROWSER_INTENT)
+      && (savedInstanceState == null || savedInstanceState.getString(BROWSER_RESULT_TYPE) == null)
+    ) {
       Intent browserIntent = getIntent().getParcelableExtra(KEY_BROWSER_INTENT);
       browserIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
       startActivity(browserIntent);
+      resultType = DEFAULT_RESULT_TYPE;
     } else {
       finish();
     }
@@ -60,14 +66,24 @@ protected void onResume() {
     if (!mOpened) {
       mOpened = true;
     } else {
-      EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity closed", "cancel"));
+      resultType = "cancel";
       finish();
     }
   }
 
   @Override
   protected void onDestroy() {
-    EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity destroyed", "dismiss"));
+    if (resultType != null) {
+      switch (resultType) {
+        case "cancel":
+          EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity closed", resultType));
+          break;
+        default:
+          EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity destroyed", DEFAULT_RESULT_TYPE));
+          break;
+      }
+      resultType = null;
+    }
     super.onDestroy();
   }
 
@@ -76,4 +92,16 @@ protected void onNewIntent(Intent intent) {
     super.onNewIntent(intent);
     setIntent(intent);
   }
+
+  @Override
+  protected void onRestoreInstanceState(Bundle savedInstanceState) {
+    super.onRestoreInstanceState(savedInstanceState);
+    resultType = savedInstanceState.getString(BROWSER_RESULT_TYPE);
+  }
+
+  @Override
+  protected void onSaveInstanceState(Bundle savedInstanceState) {
+    savedInstanceState.putString(BROWSER_RESULT_TYPE, DEFAULT_RESULT_TYPE);
+    super.onSaveInstanceState(savedInstanceState);
+  }
 }

example/App.js

@@ -111,8 +111,7 @@ export default class App extends Component {
           toolbarColor: '#6200EE',
           secondaryToolbarColor: 'black',
           enableUrlBarHiding: true,
-          enableDefaultShare: true,
-          waitForRedirectDelay: 2000
+          enableDefaultShare: true
         });
         await this.sleep(800);
         Alert.alert('Response', JSON.stringify(result));

index.d.ts

@@ -51,8 +51,7 @@ declare module 'react-native-inappbrowser-reborn' {
       endEnter: string,
       endExit: string
     },
-    headers?: { [key: string]: string },
-    waitForRedirectDelay?: number
+    headers?: { [key: string]: string }
   }
 
   export type InAppBrowserOptions = InAppBrowserAndroidOptions | InAppBrowseriOSOptions;

index.js

@@ -57,8 +57,7 @@ type InAppBrowserAndroidOptions = {
     endEnter: string,
     endExit: string
   },
-  headers?: { [key: string]: string },
-  waitForRedirectDelay?: number
+  headers?: { [key: string]: string }
 };
 
 type InAppBrowserOptions = InAppBrowserAndroidOptions | InAppBrowseriOSOptions;
@@ -72,7 +71,6 @@ async function open(
     readerMode,
     modalEnabled,
     dismissButtonStyle,
-    waitForRedirectDelay,
     enableBarCollapsing,
     preferredBarTintColor,
     preferredControlTintColor,
@@ -85,7 +83,6 @@ async function open(
     readerMode: !!readerMode,
     animated: animated !== undefined ? animated : true,
     modalEnabled: modalEnabled !== undefined ? modalEnabled : true,
-    waitForRedirectDelay: waitForRedirectDelay || 0,
     enableBarCollapsing: !!enableBarCollapsing,
     preferredBarTintColor:
       preferredBarTintColor && processColor(preferredBarTintColor),
@@ -146,11 +143,8 @@ async function _openAuthSessionPolyfillAsync(
   try {
     response = await Promise.race([
       _waitForRedirectAsync(returnUrl),
-      open(startUrl, options).then(result => {
-        return new Promise(resolve => {
-          // A delay to wait for the redirection or dismiss the browser instead
-          setTimeout(() => resolve(result), options.waitForRedirectDelay);
-        });
+      open(startUrl, options).then(function(result) {
+        return _checkResultAndReturnUrl(returnUrl, result);
       })
     ]);
   } finally {
@@ -173,6 +167,25 @@ function _waitForRedirectAsync(returnUrl: string): Promise<RedirectResult> {
   });
 }
 
+function _checkResultAndReturnUrl(
+  returnUrl: string,
+  result: RedirectResult
+): Promise<RedirectResult> {
+  return new Promise(function(resolve) {
+    Linking.getInitialURL()
+      .then(function(url) {
+        if (url && url.startsWith(returnUrl)) {
+          resolve({ url: url, type: 'success' });
+        } else {
+          resolve(result);
+        }
+      })
+      .catch(function() {
+        resolve(result);
+      });
+  });
+}
+
 async function isAvailable(): Promise<boolean> {
   if (Platform.OS === 'android') {
     return Promise.resolve(true);