[flutter_appauth] fix performance issue on Android (MaikuB#135)

* improve performance on android * bump plugin version * update changelog to include link to issue that was fixed
wdfw-fp · Aug 25, 2020 · 020a19d · 020a19d
1 parent 674f11c
commit 020a19d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 16 deletions.
diff --git a/flutter_appauth/CHANGELOG.md b/flutter_appauth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.2+3
+
+* [Android] fix issue [79](https://github.com/MaikuB/flutter_appauth/issues/79) where an authorisation request could cause the UI to momentarily hang due to AppAuth trying to warm up the browser
+
 ## 0.9.2+2
 
 * Updated example app to use a new client id that works with the demo IdentityServer instance

diff --git a/...auth/android/src/main/java/io/crossingthestreams/flutterappauth/FlutterAppauthPlugin.java b/...auth/android/src/main/java/io/crossingthestreams/flutterappauth/FlutterAppauthPlugin.java
@@ -32,6 +32,7 @@
 import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
+import io.flutter.view.FlutterNativeView;
 
 /**
  * FlutterAppauthPlugin
@@ -57,6 +58,8 @@ public class FlutterAppauthPlugin implements FlutterPlugin, MethodCallHandler, P
     private PendingOperation pendingOperation;
     private String clientSecret;
     private boolean allowInsecureConnections;
+    private AuthorizationService defaultAuthorizationService;
+    private AuthorizationService insecureAuthorizationService;
 
     /**
      * Plugin registration.
@@ -66,14 +69,27 @@ public static void registerWith(Registrar registrar) {
         plugin.setActivity(registrar.activity());
         plugin.onAttachedToEngine(registrar.context(), registrar.messenger());
         registrar.addActivityResultListener(plugin);
+        registrar.addViewDestroyListener(
+                new PluginRegistry.ViewDestroyListener() {
+                    @Override
+                    public boolean onViewDestroy(FlutterNativeView view) {
+                        plugin.disposeAuthorizationServices();
+                        return false;
+                    }
+                });
     }
 
+
     private void setActivity(Activity flutterActivity) {
         this.mainActivity = flutterActivity;
     }
 
     private void onAttachedToEngine(Context context, BinaryMessenger binaryMessenger) {
         this.applicationContext = context;
+        defaultAuthorizationService = new AuthorizationService(this.applicationContext);
+        AppAuthConfiguration.Builder authConfigBuilder = new AppAuthConfiguration.Builder();
+        authConfigBuilder.setConnectionBuilder(InsecureConnectionBuilder.INSTANCE);
+        insecureAuthorizationService = new AuthorizationService(applicationContext, authConfigBuilder.build());
         final MethodChannel channel = new MethodChannel(binaryMessenger, "crossingthestreams.io/flutter_appauth");
         channel.setMethodCallHandler(this);
     }
@@ -85,6 +101,7 @@ public void onAttachedToEngine(FlutterPluginBinding binding) {
 
     @Override
     public void onDetachedFromEngine(FlutterPluginBinding binding) {
+        disposeAuthorizationServices();
     }
 
     @Override
@@ -109,6 +126,13 @@ public void onDetachedFromActivity() {
         this.mainActivity = null;
     }
 
+    private void disposeAuthorizationServices() {
+        defaultAuthorizationService.dispose();
+        insecureAuthorizationService.dispose();
+        defaultAuthorizationService = null;
+        insecureAuthorizationService = null;
+    }
+
     private void checkAndSetPendingOperation(String method, Result result) {
         if (pendingOperation != null) {
             throw new IllegalStateException(
@@ -282,13 +306,9 @@ private void performAuthorization(AuthorizationServiceConfiguration serviceConfi
             authRequestBuilder.setAdditionalParameters(additionalParameters);
         }
 
-        AppAuthConfiguration.Builder authConfigBuilder = new AppAuthConfiguration.Builder();
-        if (allowInsecureConnections) {
-            authConfigBuilder.setConnectionBuilder(InsecureConnectionBuilder.INSTANCE);
-        }
 
-        AuthorizationService authService = new AuthorizationService(applicationContext, authConfigBuilder.build());
-        Intent authIntent = authService.getAuthorizationRequestIntent(authRequestBuilder.build());
+        AuthorizationService authorizationService = allowInsecureConnections ? insecureAuthorizationService : defaultAuthorizationService;
+        Intent authIntent = authorizationService.getAuthorizationRequestIntent(authRequestBuilder.build());
         mainActivity.startActivityForResult(authIntent, exchangeCode ? RC_AUTH_EXCHANGE_CODE : RC_AUTH);
     }
 
@@ -310,12 +330,7 @@ private void performTokenRequest(AuthorizationServiceConfiguration serviceConfig
             builder.setAdditionalParameters(tokenRequestParameters.additionalParameters);
         }
 
-        AppAuthConfiguration.Builder authConfigBuilder = new AppAuthConfiguration.Builder();
-        if (allowInsecureConnections) {
-            authConfigBuilder.setConnectionBuilder(InsecureConnectionBuilder.INSTANCE);
-        }
 
-        AuthorizationService authService = new AuthorizationService(applicationContext, authConfigBuilder.build());
         AuthorizationService.TokenResponseCallback tokenResponseCallback = new AuthorizationService.TokenResponseCallback() {
             @Override
             public void onTokenRequestCompleted(
@@ -330,10 +345,11 @@ public void onTokenRequestCompleted(
         };
 
         TokenRequest tokenRequest = builder.build();
+        AuthorizationService authorizationService = allowInsecureConnections ? insecureAuthorizationService : defaultAuthorizationService;
         if (clientSecret == null) {
-            authService.performTokenRequest(tokenRequest, tokenResponseCallback);
+            authorizationService.performTokenRequest(tokenRequest, tokenResponseCallback);
         } else {
-            authService.performTokenRequest(tokenRequest, new ClientSecretBasic(clientSecret), tokenResponseCallback);
+            authorizationService.performTokenRequest(tokenRequest, new ClientSecretBasic(clientSecret), tokenResponseCallback);
         }
 
     }
@@ -432,8 +448,6 @@ private Map<String, Object> authorizationResponseToMap(AuthorizationResponse aut
         return responseMap;
     }
 
-
-
     private class PendingOperation {
         final String method;
         final Result result;

diff --git a/flutter_appauth/pubspec.yaml b/flutter_appauth/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_appauth
 description: This plugin provides an abstraction around the Android and iOS AppAuth SDKs so it can be used to communicate with OAuth 2.0 and OpenID Connect providers
-version: 0.9.2+2
+version: 0.9.2+3
 homepage: https://github.com/MaikuB/flutter_appauth/tree/master/flutter_appauth
 
 environment: