Merge pull request #175 from ihormartsekha-okta/fix-issue-when-use-di…

…fferent-task-affinities Fix issue during signIn when taskAffinity is empty string
okta · Jul 31, 2020 · 8cda9db · 8cda9db
2 parents 1702a1a + 2e12e35
commit 8cda9db
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,8 +36,8 @@ subprojects {
 }
 
 ext {
-    versionNum = 16
-    versionName = "1.0.14"
+    versionNum = 17
+    versionName = "1.0.15"
     versionDate = new Date()
     minSdkVersion = 19
     compileSdkVersion = 29

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,17 +1,22 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.okta.oidc">
+  xmlns:tools="http://schemas.android.com/tools"
+  package="com.okta.oidc">
 
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <application>
         <activity
             android:name="com.okta.oidc.OktaAuthenticationActivity"
             android:exported="false"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+            android:launchMode="singleInstance"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:autoRemoveFromRecents="true"
+            tools:targetApi="lollipop" />
 
         <activity
             android:name="com.okta.oidc.OktaRedirectActivity"
-            android:exported="true">
+            android:exported="true"
+            android:autoRemoveFromRecents="true"
+            tools:targetApi="lollipop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

diff --git a/library/src/test/AndroidManifest.xml b/library/src/test/AndroidManifest.xml
@@ -7,8 +7,9 @@
         <activity
             android:name="com.okta.oidc.OktaAuthenticationActivity"
             android:exported="false"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+            android:launchMode="singleInstance"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+          />
 
         <activity
             android:name="com.okta.oidc.OktaRedirectActivity"