From 984d3fc1668221c166ab459d67d1c646d73d165b Mon Sep 17 00:00:00 2001 From: Mike Diarmid Date: Fri, 29 May 2020 04:41:47 +0100 Subject: [PATCH] fix(android): remove deprecated usages of `APPLICATION_ID` (#3711) Removed in preparation for Android Studio v.4.0.0 release today. [publish] --- .../ReactNativeFirebaseAppInitProvider.java | 8 ------- .../ReactNativeFirebaseInitProvider.java | 21 +----------------- .../firebase/interfaces/InitProvider.java | 22 ------------------- .../firebase/crashlytics/Constants.java | 1 - ...NativeFirebaseCrashlyticsInitProvider.java | 5 ----- 5 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 packages/app/android/src/reactnative/java/io/invertase/firebase/interfaces/InitProvider.java diff --git a/packages/app/android/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseAppInitProvider.java b/packages/app/android/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseAppInitProvider.java index ba15c87aa5..640bc5fc62 100644 --- a/packages/app/android/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseAppInitProvider.java +++ b/packages/app/android/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseAppInitProvider.java @@ -17,15 +17,7 @@ * */ -import io.invertase.firebase.BuildConfig; import io.invertase.firebase.common.ReactNativeFirebaseInitProvider; public class ReactNativeFirebaseAppInitProvider extends ReactNativeFirebaseInitProvider { - private static final String EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY = - BuildConfig.APPLICATION_ID + ".reactnativefirebaseappinitprovider"; - - @Override - public String getEmptyProviderAuthority() { - return EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY; - } } diff --git a/packages/app/android/src/reactnative/java/io/invertase/firebase/common/ReactNativeFirebaseInitProvider.java b/packages/app/android/src/reactnative/java/io/invertase/firebase/common/ReactNativeFirebaseInitProvider.java index 42fec16dab..7751b9ab00 100644 --- a/packages/app/android/src/reactnative/java/io/invertase/firebase/common/ReactNativeFirebaseInitProvider.java +++ b/packages/app/android/src/reactnative/java/io/invertase/firebase/common/ReactNativeFirebaseInitProvider.java @@ -28,29 +28,10 @@ import javax.annotation.OverridingMethodsMustInvokeSuper; import io.invertase.firebase.app.ReactNativeFirebaseApp; -import io.invertase.firebase.interfaces.InitProvider; - -public class ReactNativeFirebaseInitProvider extends ContentProvider implements InitProvider { - private static void checkContentProviderAuthority( - ProviderInfo info, - String emptyProviderAuthority - ) { - if (info != null) { - if (emptyProviderAuthority.equals(info.authority)) { - throw new IllegalStateException( - "Incorrect provider authority in manifest. This is most likely due to a missing " - + "applicationId variable in application's build.gradle."); - } - } - } - - public String getEmptyProviderAuthority() { - throw new RuntimeException("STUB: getEmptyProviderAuthority override not implemented"); - } +public class ReactNativeFirebaseInitProvider extends ContentProvider { @Override public void attachInfo(Context context, ProviderInfo info) { - checkContentProviderAuthority(info, getEmptyProviderAuthority()); super.attachInfo(context, info); } diff --git a/packages/app/android/src/reactnative/java/io/invertase/firebase/interfaces/InitProvider.java b/packages/app/android/src/reactnative/java/io/invertase/firebase/interfaces/InitProvider.java deleted file mode 100644 index ec25fa1dcf..0000000000 --- a/packages/app/android/src/reactnative/java/io/invertase/firebase/interfaces/InitProvider.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.invertase.firebase.interfaces; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -public interface InitProvider { - String getEmptyProviderAuthority(); -} diff --git a/packages/crashlytics/android/src/main/java/io/invertase/firebase/crashlytics/Constants.java b/packages/crashlytics/android/src/main/java/io/invertase/firebase/crashlytics/Constants.java index 960706214a..4d1a709409 100644 --- a/packages/crashlytics/android/src/main/java/io/invertase/firebase/crashlytics/Constants.java +++ b/packages/crashlytics/android/src/main/java/io/invertase/firebase/crashlytics/Constants.java @@ -18,7 +18,6 @@ */ class Constants { - final static String EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY = BuildConfig.APPLICATION_ID + ".reactnativefirebasecrashlyticsinitprovider"; final static String KEY_CRASHLYTICS_NDK_ENABLED = "crashlytics_ndk_enabled"; final static String KEY_CRASHLYTICS_DEBUG_ENABLED = "crashlytics_debug_enabled"; final static String KEY_CRASHLYTICS_AUTO_COLLECTION_ENABLED = "crashlytics_auto_collection_enabled"; diff --git a/packages/crashlytics/android/src/main/java/io/invertase/firebase/crashlytics/ReactNativeFirebaseCrashlyticsInitProvider.java b/packages/crashlytics/android/src/main/java/io/invertase/firebase/crashlytics/ReactNativeFirebaseCrashlyticsInitProvider.java index d04cb6cb33..d8bd1ce44c 100644 --- a/packages/crashlytics/android/src/main/java/io/invertase/firebase/crashlytics/ReactNativeFirebaseCrashlyticsInitProvider.java +++ b/packages/crashlytics/android/src/main/java/io/invertase/firebase/crashlytics/ReactNativeFirebaseCrashlyticsInitProvider.java @@ -49,11 +49,6 @@ static boolean isCrashlyticsCollectionEnabled() { return enabled; } - @Override - public String getEmptyProviderAuthority() { - return EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY; - } - @Override public boolean onCreate() { super.onCreate();