Skip to content

Commit 984d3fc

Browse files
authored
fix(android): remove deprecated usages of APPLICATION_ID (#3711)
Removed in preparation for Android Studio v.4.0.0 release today. [publish]
1 parent 8b72876 commit 984d3fc

File tree

5 files changed

+1
-56
lines changed

5 files changed

+1
-56
lines changed

packages/app/android/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseAppInitProvider.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,7 @@
1717
*
1818
*/
1919

20-
import io.invertase.firebase.BuildConfig;
2120
import io.invertase.firebase.common.ReactNativeFirebaseInitProvider;
2221

2322
public class ReactNativeFirebaseAppInitProvider extends ReactNativeFirebaseInitProvider {
24-
private static final String EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY =
25-
BuildConfig.APPLICATION_ID + ".reactnativefirebaseappinitprovider";
26-
27-
@Override
28-
public String getEmptyProviderAuthority() {
29-
return EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY;
30-
}
3123
}

packages/app/android/src/reactnative/java/io/invertase/firebase/common/ReactNativeFirebaseInitProvider.java

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,10 @@
2828
import javax.annotation.OverridingMethodsMustInvokeSuper;
2929

3030
import io.invertase.firebase.app.ReactNativeFirebaseApp;
31-
import io.invertase.firebase.interfaces.InitProvider;
32-
33-
public class ReactNativeFirebaseInitProvider extends ContentProvider implements InitProvider {
34-
private static void checkContentProviderAuthority(
35-
ProviderInfo info,
36-
String emptyProviderAuthority
37-
) {
38-
if (info != null) {
39-
if (emptyProviderAuthority.equals(info.authority)) {
40-
throw new IllegalStateException(
41-
"Incorrect provider authority in manifest. This is most likely due to a missing "
42-
+ "applicationId variable in application's build.gradle.");
43-
}
44-
}
45-
}
46-
47-
public String getEmptyProviderAuthority() {
48-
throw new RuntimeException("STUB: getEmptyProviderAuthority override not implemented");
49-
}
5031

32+
public class ReactNativeFirebaseInitProvider extends ContentProvider {
5133
@Override
5234
public void attachInfo(Context context, ProviderInfo info) {
53-
checkContentProviderAuthority(info, getEmptyProviderAuthority());
5435
super.attachInfo(context, info);
5536
}
5637

packages/app/android/src/reactnative/java/io/invertase/firebase/interfaces/InitProvider.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

packages/crashlytics/android/src/main/java/io/invertase/firebase/crashlytics/Constants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919

2020
class Constants {
21-
final static String EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY = BuildConfig.APPLICATION_ID + ".reactnativefirebasecrashlyticsinitprovider";
2221
final static String KEY_CRASHLYTICS_NDK_ENABLED = "crashlytics_ndk_enabled";
2322
final static String KEY_CRASHLYTICS_DEBUG_ENABLED = "crashlytics_debug_enabled";
2423
final static String KEY_CRASHLYTICS_AUTO_COLLECTION_ENABLED = "crashlytics_auto_collection_enabled";

packages/crashlytics/android/src/main/java/io/invertase/firebase/crashlytics/ReactNativeFirebaseCrashlyticsInitProvider.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ static boolean isCrashlyticsCollectionEnabled() {
4949
return enabled;
5050
}
5151

52-
@Override
53-
public String getEmptyProviderAuthority() {
54-
return EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY;
55-
}
56-
5752
@Override
5853
public boolean onCreate() {
5954
super.onCreate();

0 commit comments

Comments
 (0)