Merge pull request #1641 from microsoft/develop

Version 4.4.5
microsoft · Jun 27, 2022 · 39fd75a · 39fd75a
2 parents db681ce + 522a8aa
commit 39fd75a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # App Center SDK for Android Change Log
 
+## Version 4.4.5
+
+### App Center
+
+* **[Fix]** Fix crash when SDK is started from overridden `Application.attachBaseContext`.
+
+ ___
+
 ## Version 4.4.4
 
 ### App Center

diff --git a/sdk/appcenter/src/main/java/com/microsoft/appcenter/ApplicationContextUtils.java b/sdk/appcenter/src/main/java/com/microsoft/appcenter/ApplicationContextUtils.java
@@ -35,7 +35,7 @@ static Context getApplicationContext(Application application) {
                 return application.createDeviceProtectedStorageContext();
             }
         }
-        return application.getApplicationContext();
+        return application;
     }
 
     /**

diff --git a/sdk/appcenter/src/test/java/com/microsoft/appcenter/ApplicationContextUtilsTest.java b/sdk/appcenter/src/test/java/com/microsoft/appcenter/ApplicationContextUtilsTest.java
@@ -8,6 +8,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
@@ -39,7 +40,6 @@ public class ApplicationContextUtilsTest {
 
     @Before
     public void setUp() {
-        when(mApplication.getApplicationContext()).thenReturn(mApplication);
         when(mApplication.isDeviceProtectedStorage()).thenReturn(false);
         when(mApplication.createDeviceProtectedStorageContext()).thenReturn(mDeviceProtectedStorageContext);
         when(mApplication.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
@@ -80,8 +80,8 @@ public void contextOnNewUnlockedDevice() {
         /* It should be regular context. */
         assertEquals(mApplication, ApplicationContextUtils.getApplicationContext(mApplication));
 
-        /* Verify get application context. */
-        verify(mApplication).getApplicationContext();
+        /* We should use application object directly, without getApplicationContext call. */
+        verify(mApplication, never()).getApplicationContext();
     }
 
     @Test
@@ -96,8 +96,8 @@ public void contextOnOldDevice() {
         /* It should be regular context. */
         assertEquals(mApplication, ApplicationContextUtils.getApplicationContext(mApplication));
 
-        /* Verify get application context. */
-        verify(mApplication).getApplicationContext();
+        /* We should use application object directly, without getApplicationContext call. */
+        verify(mApplication, never()).getApplicationContext();
     }
 
     @Test

diff --git a/versions.gradle b/versions.gradle
@@ -7,7 +7,7 @@
 
 ext {
     versionCode = 68
-    versionName = '4.4.4'
+    versionName = '4.4.5'
     minSdkVersion = 21
     compileSdkVersion = 31
     targetSdkVersion = 31