Merge pull request #173 from immutable/fix/android-proguard

[DX-2700] fix: android login and connect pkce not working if minify is enabled in sample app

Author: nattb8

sample/Assets/Plugins/Android/proguard-user.txt

@@ -0,0 +1,7 @@
+-dontwarn com.immutable.**
+-keep class com.immutable.** { *; }
+-keep interface com.immutable.** { *; }
+
+-dontwarn androidx.**
+-keep class androidx.** { *; }
+-keep interface androidx.** { *; }

sample/Assets/Plugins/Android/proguard-user.txt.meta

@@ -102,7 +102,11 @@ public async void Login()
             {
                 error = $"Login() error: {ex.Message}";
                 // Restart everything
+#if (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX
                 await passport.Logout();
+#else
+                await passport.LogoutPKCE();
+#endif
             }
 
             Debug.Log(error);
@@ -169,7 +173,11 @@ public async void Connect()
             {
                 error = $"Connect() error: {ex.Message}";
                 // Restart everything
+#if (UNITY_ANDROID && !UNITY_EDITOR_WIN) || (UNITY_IPHONE && !UNITY_EDITOR_WIN) || UNITY_STANDALONE_OSX
                 await passport.Logout();
+#else
+                await passport.LogoutPKCE();
+#endif
             }
 
             Debug.Log(error);

sample/Assets/Scripts/UnauthenticatedScript.cs

@@ -245,7 +245,7 @@ PlayerSettings:
   useCustomLauncherGradleManifest: 0
   useCustomBaseGradleTemplate: 0
   useCustomGradlePropertiesTemplate: 0
-  useCustomProguardFile: 0
+  useCustomProguardFile: 1
   AndroidTargetArchitectures: 2
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0