Remove extra call of getApplicationContext()

microsoft · Jun 24, 2022 · 30d5e03 · 30d5e03
1 parent 90baebb
commit 30d5e03
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Version 4.4.5 (Under development)
 
+### App Center
+
+* **[Fix]** Fix crash when SDK is started from overridden `Application.attachBaseContext`.
+
  ___
 
 ## Version 4.4.4

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
@@ -39,7 +39,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);
@@ -79,9 +78,6 @@ public void contextOnNewUnlockedDevice() {
 
         /* It should be regular context. */
         assertEquals(mApplication, ApplicationContextUtils.getApplicationContext(mApplication));
-
-        /* Verify get application context. */
-        verify(mApplication).getApplicationContext();
     }
 
     @Test
@@ -95,9 +91,6 @@ public void contextOnOldDevice() {
 
         /* It should be regular context. */
         assertEquals(mApplication, ApplicationContextUtils.getApplicationContext(mApplication));
-
-        /* Verify get application context. */
-        verify(mApplication).getApplicationContext();
     }
 
     @Test