From c30a4a0aa6342579ea09db3c6978526b15b42bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Wed, 27 Mar 2019 11:04:42 +0100
Subject: [PATCH] android: make Amplitude and Dropbox modules package private

---
 .../jitsi/meet/sdk/{analytics => }/AmplitudeModule.java   | 4 ++--
 .../meet/sdk/{dropbox/Dropbox.java => DropboxModule.java} | 8 ++++----
 .../org/jitsi/meet/sdk/ReactInstanceManagerHolder.java    | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename android/sdk/src/main/java/org/jitsi/meet/sdk/{analytics => }/AmplitudeModule.java (97%)
 rename android/sdk/src/main/java/org/jitsi/meet/sdk/{dropbox/Dropbox.java => DropboxModule.java} (97%)

diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/analytics/AmplitudeModule.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java
similarity index 97%
rename from android/sdk/src/main/java/org/jitsi/meet/sdk/analytics/AmplitudeModule.java
rename to android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java
index ebd4acba3..b1c3f4d1a 100644
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/analytics/AmplitudeModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jitsi.meet.sdk.analytics;
+package org.jitsi.meet.sdk;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -31,7 +31,7 @@ import org.json.JSONObject;
  * Implements the react-native module for the Amplitude integration.
  */
 @ReactModule(name = AmplitudeModule.NAME)
-public class AmplitudeModule
+class AmplitudeModule
         extends ReactContextBaseJavaModule {
 
     public static final String NAME = "Amplitude";
diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/dropbox/Dropbox.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/DropboxModule.java
similarity index 97%
rename from android/sdk/src/main/java/org/jitsi/meet/sdk/dropbox/Dropbox.java
rename to android/sdk/src/main/java/org/jitsi/meet/sdk/DropboxModule.java
index 2777f5193..80f335914 100644
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/dropbox/Dropbox.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/DropboxModule.java
@@ -1,4 +1,4 @@
-package org.jitsi.meet.sdk.dropbox;
+package org.jitsi.meet.sdk;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -28,8 +28,8 @@ import java.util.Map;
 /**
  * Implements the react-native module for the dropbox integration.
  */
-@ReactModule(name = Dropbox.NAME)
-public class Dropbox
+@ReactModule(name = DropboxModule.NAME)
+class DropboxModule
         extends ReactContextBaseJavaModule
         implements LifecycleEventListener {
 
@@ -43,7 +43,7 @@ public class Dropbox
 
     private Promise promise;
 
-    public Dropbox(ReactApplicationContext reactContext) {
+    public DropboxModule(ReactApplicationContext reactContext) {
         super(reactContext);
 
         String pkg = reactContext.getApplicationContext().getPackageName();
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 44ded0da1..0a722573d 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
@@ -48,16 +48,16 @@ class ReactInstanceManagerHolder {
             ReactApplicationContext reactContext) {
         List<NativeModule> nativeModules
             = new ArrayList<>(Arrays.<NativeModule>asList(
+                new AmplitudeModule(reactContext),
                 new AndroidSettingsModule(reactContext),
                 new AppInfoModule(reactContext),
                 new AudioModeModule(reactContext),
+                new DropboxModule(reactContext),
                 new ExternalAPIModule(reactContext),
                 new LocaleDetector(reactContext),
                 new PictureInPictureModule(reactContext),
                 new ProximityModule(reactContext),
                 new WiFiStatsModule(reactContext),
-                new org.jitsi.meet.sdk.analytics.AmplitudeModule(reactContext),
-                new org.jitsi.meet.sdk.dropbox.Dropbox(reactContext),
                 new org.jitsi.meet.sdk.net.NAT64AddrInfoModule(reactContext)));
 
         if (AudioModeModule.useConnectionService()) {