diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index 8606327486..5206029896 100644 --- a/android/sdk/build.gradle +++ b/android/sdk/build.gradle @@ -51,15 +51,10 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.startup:startup-runtime:1.1.0" - if (rootProject.ext.libreBuild) { - implementation(project(':react-native-device-info')) { - exclude group: 'com.google.firebase' - exclude group: 'com.google.android.gms' - exclude group: 'com.android.installreferrer' - } - } else { + // Only add these packages if we are NOT doing a LIBRE_BUILD + if (!rootProject.ext.libreBuild) { implementation project(':react-native-amplitude') - implementation project(':react-native-device-info') + implementation project(':react-native-giphy') implementation(project(":react-native-google-signin")) { exclude group: 'com.google.android.gms' exclude group: 'androidx' @@ -72,9 +67,13 @@ dependencies { implementation project(':react-native-community_clipboard') implementation project(':react-native-community_netinfo') implementation project(':react-native-default-preference') + implementation(project(':react-native-device-info')) { + exclude group: 'com.google.firebase' + exclude group: 'com.google.android.gms' + exclude group: 'com.android.installreferrer' + } implementation project(':react-native-gesture-handler') implementation project(':react-native-get-random-values') - implementation project(':react-native-giphy') implementation project(':react-native-immersive') implementation project(':react-native-keep-awake') implementation project(':react-native-masked-view_masked-view') diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java index 6584895925..01bf269e76 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java @@ -46,6 +46,8 @@ import java.util.Arrays; import java.util.List; class ReactInstanceManagerHolder { + private static final String TAG = ReactInstanceManagerHolder.class.getSimpleName(); + /** * FIXME (from linter): Do not place Android context classes in static * fields (static reference to ReactInstanceManager which has field @@ -110,7 +112,6 @@ class ReactInstanceManagerHolder { new com.corbt.keepawake.KCKeepAwakePackage(), new com.facebook.react.shell.MainReactPackage(), new com.reactnativecommunity.clipboard.ClipboardPackage(), - new com.giphyreactnativesdk.GiphyReactNativeSdkPackage(), new com.reactnativecommunity.netinfo.NetInfoPackage(), new com.reactnativepagerview.PagerViewPackage(), new com.oblador.performance.PerformancePackage(), @@ -146,6 +147,17 @@ class ReactInstanceManagerHolder { packages.add((ReactPackage)constructor.newInstance()); } catch (Exception e) { // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled. + Log.d(TAG, "Not loading AmplitudeReactNativePackage"); + } + + // GiphyReactNativeSdkPackage + try { + Class giphyPackageClass = Class.forName("com.giphyreactnativesdk.GiphyReactNativeSdkPackage"); + Constructor constructor = giphyPackageClass.getConstructor(); + packages.add((ReactPackage)constructor.newInstance()); + } catch (Exception e) { + // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled. + Log.d(TAG, "Not loading GiphyReactNativeSdkPackage"); } // RNGoogleSignInPackage @@ -155,6 +167,7 @@ class ReactInstanceManagerHolder { packages.add((ReactPackage)constructor.newInstance()); } catch (Exception e) { // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled. + Log.d(TAG, "Not loading RNGoogleSignInPackage"); } return packages; @@ -240,7 +253,7 @@ class ReactInstanceManagerHolder { return; } - Log.d(ReactInstanceManagerHolder.class.getCanonicalName(), "initializing RN with Application"); + Log.d(TAG, "initializing RN with Application"); reactInstanceManager = ReactInstanceManager.builder() diff --git a/react/features/base/config/functions.native.js b/react/features/base/config/functions.native.js index bd69b01bf2..c4d477c3b7 100644 --- a/react/features/base/config/functions.native.js +++ b/react/features/base/config/functions.native.js @@ -19,6 +19,7 @@ export function _cleanupConfig(config: Object) { delete config.analytics?.googleAnalyticsTrackingId; delete config.callStatsID; delete config.callStatsSecret; + config.giphy = { enabled: false }; } }