From e857aaf483addcea1ed17a9f14cb9531f931a173 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Wed, 14 Oct 2020 11:07:00 -0300 Subject: [PATCH 01/19] [FIX] F-Droid build for store --- android/app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 59e9fc646a..827c31d514 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -195,6 +195,7 @@ android { flavorDimensions "type" productFlavors { foss { + applicationId "chat.rocket.android" dimension = "type" buildConfigField "boolean", "FDROID_BUILD", "true" } From de148280bb7fc7984b03a858265fec822163cd5b Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Thu, 15 Oct 2020 10:27:41 -0300 Subject: [PATCH 02/19] Trying to make Override custom push notifications on play build only --- android/app/build.gradle | 4 +- .../reactnative/CustomPushNotification.java | 20 ---- .../reactnative/DismissNotification.java | 12 --- .../java/chat/rocket/reactnative/Ejson.java | 97 ------------------- .../rocket/reactnative/ReplyBroadcast.java | 13 --- android/app/src/main/AndroidManifest.xml | 9 -- .../rocket/reactnative/MainApplication.java | 20 +--- android/app/src/play/AndroidManifest.xml | 58 +---------- .../reactnative/MainPlayApplication.java | 23 +++++ 9 files changed, 30 insertions(+), 226 deletions(-) delete mode 100644 android/app/src/foss/java/chat/rocket/reactnative/CustomPushNotification.java delete mode 100644 android/app/src/foss/java/chat/rocket/reactnative/DismissNotification.java delete mode 100644 android/app/src/foss/java/chat/rocket/reactnative/Ejson.java delete mode 100644 android/app/src/foss/java/chat/rocket/reactnative/ReplyBroadcast.java create mode 100644 android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java diff --git a/android/app/build.gradle b/android/app/build.gradle index 827c31d514..23a69a760e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -148,8 +148,8 @@ android { vectorDrawables.useSupportLibrary = true if (isPlay) { manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] + missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below! } - missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below! } signingConfigs { @@ -234,9 +234,9 @@ android { dependencies { addUnimodulesDependencies() implementation project(':watermelondb') - implementation project(':reactnativenotifications') implementation project(":reactnativekeyboardinput") implementation project(':@react-native-community_viewpager') + playImplementation project(':reactnativenotifications') playImplementation project(':@react-native-firebase_app') playImplementation project(':@react-native-firebase_analytics') playImplementation project(':@react-native-firebase_crashlytics') diff --git a/android/app/src/foss/java/chat/rocket/reactnative/CustomPushNotification.java b/android/app/src/foss/java/chat/rocket/reactnative/CustomPushNotification.java deleted file mode 100644 index d8c0502eb8..0000000000 --- a/android/app/src/foss/java/chat/rocket/reactnative/CustomPushNotification.java +++ /dev/null @@ -1,20 +0,0 @@ -package chat.rocket.reactnative; - -import android.content.Context; -import android.os.Bundle; - -import com.facebook.react.bridge.ReactApplicationContext; -import com.wix.reactnativenotifications.core.AppLaunchHelper; -import com.wix.reactnativenotifications.core.AppLifecycleFacade; -import com.wix.reactnativenotifications.core.JsIOHelper; -import com.wix.reactnativenotifications.core.notification.PushNotification; - -public class CustomPushNotification extends PushNotification { - public static ReactApplicationContext reactApplicationContext; - - public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade appLifecycleFacade, AppLaunchHelper appLaunchHelper, JsIOHelper jsIoHelper) { - super(context, bundle, appLifecycleFacade, appLaunchHelper, jsIoHelper); - reactApplicationContext = new ReactApplicationContext(context); - } - -} diff --git a/android/app/src/foss/java/chat/rocket/reactnative/DismissNotification.java b/android/app/src/foss/java/chat/rocket/reactnative/DismissNotification.java deleted file mode 100644 index 48350be518..0000000000 --- a/android/app/src/foss/java/chat/rocket/reactnative/DismissNotification.java +++ /dev/null @@ -1,12 +0,0 @@ -package chat.rocket.reactnative; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -public class DismissNotification extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - - } -} diff --git a/android/app/src/foss/java/chat/rocket/reactnative/Ejson.java b/android/app/src/foss/java/chat/rocket/reactnative/Ejson.java deleted file mode 100644 index baf2632605..0000000000 --- a/android/app/src/foss/java/chat/rocket/reactnative/Ejson.java +++ /dev/null @@ -1,97 +0,0 @@ -package chat.rocket.reactnative; - -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.Callback; - -import com.ammarahmed.mmkv.SecureKeystore; -import com.tencent.mmkv.MMKV; - -import java.math.BigInteger; - -class RNCallback implements Callback { - public void invoke(Object... args) { - - } -} - -class Utils { - static public String toHex(String arg) { - try { - return String.format("%x", new BigInteger(1, arg.getBytes("UTF-8"))); - } catch (Exception e) { - return ""; - } - } -} - -public class Ejson { - String host; - String rid; - String type; - Sender sender; - String messageId; - String notificationType; - - private MMKV mmkv; - - private String TOKEN_KEY = "reactnativemeteor_usertoken-"; - - public Ejson() { - ReactApplicationContext reactApplicationContext = CustomPushNotification.reactApplicationContext; - - // Start MMKV container - MMKV.initialize(reactApplicationContext); - SecureKeystore secureKeystore = new SecureKeystore(reactApplicationContext); - - // https://github.com/ammarahm-ed/react-native-mmkv-storage/blob/master/src/loader.js#L31 - String alias = Utils.toHex("com.MMKV.default"); - - // Retrieve container password - secureKeystore.getSecureKey(alias, new RNCallback() { - @Override - public void invoke(Object... args) { - String error = (String) args[0]; - if (error == null) { - String password = (String) args[1]; - mmkv = MMKV.mmkvWithID("default", MMKV.SINGLE_PROCESS_MODE, password); - } - } - }); - } - - public String getAvatarUri() { - if (type == null) { - return null; - } - return serverURL() + "/avatar/" + this.sender.username + "?rc_token=" + token() + "&rc_uid=" + userId(); - } - - public String token() { - String userId = userId(); - if (mmkv != null && userId != null) { - return mmkv.decodeString(TOKEN_KEY.concat(userId)); - } - return ""; - } - - public String userId() { - String serverURL = serverURL(); - if (mmkv != null && serverURL != null) { - return mmkv.decodeString(TOKEN_KEY.concat(serverURL)); - } - return ""; - } - - public String serverURL() { - String url = this.host; - if (url != null && url.endsWith("/")) { - url = url.substring(0, url.length() - 1); - } - return url; - } - - public class Sender { - String username; - String _id; - } -} \ No newline at end of file diff --git a/android/app/src/foss/java/chat/rocket/reactnative/ReplyBroadcast.java b/android/app/src/foss/java/chat/rocket/reactnative/ReplyBroadcast.java deleted file mode 100644 index 5203495b88..0000000000 --- a/android/app/src/foss/java/chat/rocket/reactnative/ReplyBroadcast.java +++ /dev/null @@ -1,13 +0,0 @@ -package chat.rocket.reactnative; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -public class ReplyBroadcast extends BroadcastReceiver { - - @Override - public void onReceive(Context context, Intent intent) { - - } -} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f95275dfe4..ed38ab5278 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -44,15 +44,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java b/android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java new file mode 100644 index 0000000000..b78dd0ea52 --- /dev/null +++ b/android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java @@ -0,0 +1,23 @@ +package chat.rocket.reactnative; + +import android.content.Context; +import android.os.Bundle; + +import com.wix.reactnativenotifications.core.AppLaunchHelper; +import com.wix.reactnativenotifications.core.AppLifecycleFacade; +import com.wix.reactnativenotifications.core.JsIOHelper; +import com.wix.reactnativenotifications.core.notification.INotificationsApplication; +import com.wix.reactnativenotifications.core.notification.IPushNotification; + +public class MainPlayApplication extends MainApplication implements INotificationsApplication { + @Override + public IPushNotification getPushNotification(Context context, Bundle bundle, AppLifecycleFacade defaultFacade, AppLaunchHelper defaultAppLaunchHelper) { + return new CustomPushNotification( + context, + bundle, + defaultFacade, + defaultAppLaunchHelper, + new JsIOHelper() + ); + } +} From db142ef46af4e0470bd3ce7da1429ffa1f79ee83 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Tue, 20 Oct 2020 12:58:28 -0300 Subject: [PATCH 03/19] Use play sourceSets --- android/app/build.gradle | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 23a69a760e..d752d82a1c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -204,6 +204,16 @@ android { buildConfigField "boolean", "FDROID_BUILD", "false" } } + sourceSets { + playDebug { + java.srcDirs = ['src/main/java', 'src/play/java'] + manifest.srcFile 'src/play/AndroidManifest.xml' + } + playRelease { + java.srcDirs = ['src/main/java', 'src/play/java'] + manifest.srcFile 'src/play/AndroidManifest.xml' + } + } applicationVariants.all { variant -> variant.outputs.each { output -> From bd3c221f6165c5c9a740b7dbfbcf34acf38148d3 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Wed, 21 Oct 2020 11:52:23 -0300 Subject: [PATCH 04/19] Change version code --- android/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle.properties b/android/gradle.properties index 26d0e83727..ae29a10e13 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -30,5 +30,5 @@ android.enableJetifier=true FLIPPER_VERSION=0.51.0 # App properties -VERSIONCODE=999999999 +VERSIONCODE=2137 BugsnagAPIKey="" \ No newline at end of file From 0ebb228f0a56a452b8e1e092e444304527c90cda Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Wed, 21 Oct 2020 17:45:24 -0300 Subject: [PATCH 05/19] Fix react-native-config-reader --- android/app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index d752d82a1c..6c68c64373 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -198,6 +198,7 @@ android { applicationId "chat.rocket.android" dimension = "type" buildConfigField "boolean", "FDROID_BUILD", "true" + resValue "string", "rn_config_reader_custom_package", "chat.rocket.reactnative" } play { dimension = "type" From bebd66d13e2ff6054226a41863f60f04593df685 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Wed, 14 Oct 2020 11:07:00 -0300 Subject: [PATCH 06/19] [FIX] F-Droid build for store --- android/app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 59e9fc646a..827c31d514 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -195,6 +195,7 @@ android { flavorDimensions "type" productFlavors { foss { + applicationId "chat.rocket.android" dimension = "type" buildConfigField "boolean", "FDROID_BUILD", "true" } From c4de99ad526517a43db88ec77d0777b9dc8fa5c0 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Thu, 15 Oct 2020 10:27:41 -0300 Subject: [PATCH 07/19] Trying to make Override custom push notifications on play build only --- android/app/build.gradle | 4 +- .../reactnative/CustomPushNotification.java | 20 ---- .../reactnative/DismissNotification.java | 12 --- .../java/chat/rocket/reactnative/Ejson.java | 97 ------------------- .../rocket/reactnative/ReplyBroadcast.java | 13 --- android/app/src/main/AndroidManifest.xml | 9 -- .../rocket/reactnative/MainApplication.java | 20 +--- android/app/src/play/AndroidManifest.xml | 58 +---------- .../reactnative/MainPlayApplication.java | 23 +++++ 9 files changed, 30 insertions(+), 226 deletions(-) delete mode 100644 android/app/src/foss/java/chat/rocket/reactnative/CustomPushNotification.java delete mode 100644 android/app/src/foss/java/chat/rocket/reactnative/DismissNotification.java delete mode 100644 android/app/src/foss/java/chat/rocket/reactnative/Ejson.java delete mode 100644 android/app/src/foss/java/chat/rocket/reactnative/ReplyBroadcast.java create mode 100644 android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java diff --git a/android/app/build.gradle b/android/app/build.gradle index 827c31d514..23a69a760e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -148,8 +148,8 @@ android { vectorDrawables.useSupportLibrary = true if (isPlay) { manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] + missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below! } - missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below! } signingConfigs { @@ -234,9 +234,9 @@ android { dependencies { addUnimodulesDependencies() implementation project(':watermelondb') - implementation project(':reactnativenotifications') implementation project(":reactnativekeyboardinput") implementation project(':@react-native-community_viewpager') + playImplementation project(':reactnativenotifications') playImplementation project(':@react-native-firebase_app') playImplementation project(':@react-native-firebase_analytics') playImplementation project(':@react-native-firebase_crashlytics') diff --git a/android/app/src/foss/java/chat/rocket/reactnative/CustomPushNotification.java b/android/app/src/foss/java/chat/rocket/reactnative/CustomPushNotification.java deleted file mode 100644 index d8c0502eb8..0000000000 --- a/android/app/src/foss/java/chat/rocket/reactnative/CustomPushNotification.java +++ /dev/null @@ -1,20 +0,0 @@ -package chat.rocket.reactnative; - -import android.content.Context; -import android.os.Bundle; - -import com.facebook.react.bridge.ReactApplicationContext; -import com.wix.reactnativenotifications.core.AppLaunchHelper; -import com.wix.reactnativenotifications.core.AppLifecycleFacade; -import com.wix.reactnativenotifications.core.JsIOHelper; -import com.wix.reactnativenotifications.core.notification.PushNotification; - -public class CustomPushNotification extends PushNotification { - public static ReactApplicationContext reactApplicationContext; - - public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade appLifecycleFacade, AppLaunchHelper appLaunchHelper, JsIOHelper jsIoHelper) { - super(context, bundle, appLifecycleFacade, appLaunchHelper, jsIoHelper); - reactApplicationContext = new ReactApplicationContext(context); - } - -} diff --git a/android/app/src/foss/java/chat/rocket/reactnative/DismissNotification.java b/android/app/src/foss/java/chat/rocket/reactnative/DismissNotification.java deleted file mode 100644 index 48350be518..0000000000 --- a/android/app/src/foss/java/chat/rocket/reactnative/DismissNotification.java +++ /dev/null @@ -1,12 +0,0 @@ -package chat.rocket.reactnative; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -public class DismissNotification extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - - } -} diff --git a/android/app/src/foss/java/chat/rocket/reactnative/Ejson.java b/android/app/src/foss/java/chat/rocket/reactnative/Ejson.java deleted file mode 100644 index baf2632605..0000000000 --- a/android/app/src/foss/java/chat/rocket/reactnative/Ejson.java +++ /dev/null @@ -1,97 +0,0 @@ -package chat.rocket.reactnative; - -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.Callback; - -import com.ammarahmed.mmkv.SecureKeystore; -import com.tencent.mmkv.MMKV; - -import java.math.BigInteger; - -class RNCallback implements Callback { - public void invoke(Object... args) { - - } -} - -class Utils { - static public String toHex(String arg) { - try { - return String.format("%x", new BigInteger(1, arg.getBytes("UTF-8"))); - } catch (Exception e) { - return ""; - } - } -} - -public class Ejson { - String host; - String rid; - String type; - Sender sender; - String messageId; - String notificationType; - - private MMKV mmkv; - - private String TOKEN_KEY = "reactnativemeteor_usertoken-"; - - public Ejson() { - ReactApplicationContext reactApplicationContext = CustomPushNotification.reactApplicationContext; - - // Start MMKV container - MMKV.initialize(reactApplicationContext); - SecureKeystore secureKeystore = new SecureKeystore(reactApplicationContext); - - // https://github.com/ammarahm-ed/react-native-mmkv-storage/blob/master/src/loader.js#L31 - String alias = Utils.toHex("com.MMKV.default"); - - // Retrieve container password - secureKeystore.getSecureKey(alias, new RNCallback() { - @Override - public void invoke(Object... args) { - String error = (String) args[0]; - if (error == null) { - String password = (String) args[1]; - mmkv = MMKV.mmkvWithID("default", MMKV.SINGLE_PROCESS_MODE, password); - } - } - }); - } - - public String getAvatarUri() { - if (type == null) { - return null; - } - return serverURL() + "/avatar/" + this.sender.username + "?rc_token=" + token() + "&rc_uid=" + userId(); - } - - public String token() { - String userId = userId(); - if (mmkv != null && userId != null) { - return mmkv.decodeString(TOKEN_KEY.concat(userId)); - } - return ""; - } - - public String userId() { - String serverURL = serverURL(); - if (mmkv != null && serverURL != null) { - return mmkv.decodeString(TOKEN_KEY.concat(serverURL)); - } - return ""; - } - - public String serverURL() { - String url = this.host; - if (url != null && url.endsWith("/")) { - url = url.substring(0, url.length() - 1); - } - return url; - } - - public class Sender { - String username; - String _id; - } -} \ No newline at end of file diff --git a/android/app/src/foss/java/chat/rocket/reactnative/ReplyBroadcast.java b/android/app/src/foss/java/chat/rocket/reactnative/ReplyBroadcast.java deleted file mode 100644 index 5203495b88..0000000000 --- a/android/app/src/foss/java/chat/rocket/reactnative/ReplyBroadcast.java +++ /dev/null @@ -1,13 +0,0 @@ -package chat.rocket.reactnative; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -public class ReplyBroadcast extends BroadcastReceiver { - - @Override - public void onReceive(Context context, Intent intent) { - - } -} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f95275dfe4..ed38ab5278 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -44,15 +44,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java b/android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java new file mode 100644 index 0000000000..b78dd0ea52 --- /dev/null +++ b/android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java @@ -0,0 +1,23 @@ +package chat.rocket.reactnative; + +import android.content.Context; +import android.os.Bundle; + +import com.wix.reactnativenotifications.core.AppLaunchHelper; +import com.wix.reactnativenotifications.core.AppLifecycleFacade; +import com.wix.reactnativenotifications.core.JsIOHelper; +import com.wix.reactnativenotifications.core.notification.INotificationsApplication; +import com.wix.reactnativenotifications.core.notification.IPushNotification; + +public class MainPlayApplication extends MainApplication implements INotificationsApplication { + @Override + public IPushNotification getPushNotification(Context context, Bundle bundle, AppLifecycleFacade defaultFacade, AppLaunchHelper defaultAppLaunchHelper) { + return new CustomPushNotification( + context, + bundle, + defaultFacade, + defaultAppLaunchHelper, + new JsIOHelper() + ); + } +} From 4c266b8603873cb6125861ec2b14614d40eb6251 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Tue, 20 Oct 2020 12:58:28 -0300 Subject: [PATCH 08/19] Use play sourceSets --- android/app/build.gradle | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 23a69a760e..d752d82a1c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -204,6 +204,16 @@ android { buildConfigField "boolean", "FDROID_BUILD", "false" } } + sourceSets { + playDebug { + java.srcDirs = ['src/main/java', 'src/play/java'] + manifest.srcFile 'src/play/AndroidManifest.xml' + } + playRelease { + java.srcDirs = ['src/main/java', 'src/play/java'] + manifest.srcFile 'src/play/AndroidManifest.xml' + } + } applicationVariants.all { variant -> variant.outputs.each { output -> From ce3ed46df9ceb87b3fb0460792031c926bb6a632 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Wed, 21 Oct 2020 11:52:23 -0300 Subject: [PATCH 09/19] Change version code --- android/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle.properties b/android/gradle.properties index 26d0e83727..ae29a10e13 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -30,5 +30,5 @@ android.enableJetifier=true FLIPPER_VERSION=0.51.0 # App properties -VERSIONCODE=999999999 +VERSIONCODE=2137 BugsnagAPIKey="" \ No newline at end of file From 893c25dc0c21ea4d8f2fe7a4cb66e67d5fb2ea39 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Wed, 21 Oct 2020 17:45:24 -0300 Subject: [PATCH 10/19] Fix react-native-config-reader --- android/app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index d752d82a1c..6c68c64373 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -198,6 +198,7 @@ android { applicationId "chat.rocket.android" dimension = "type" buildConfigField "boolean", "FDROID_BUILD", "true" + resValue "string", "rn_config_reader_custom_package", "chat.rocket.reactnative" } play { dimension = "type" From a9ab6aac7f258e706d63b8852e7eced0ed290460 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Tue, 27 Oct 2020 15:14:25 -0300 Subject: [PATCH 11/19] Remove react-native-device-info Google dependencies / Use LIBRE_BUILD of react-native-jitsi-meet --- android/build.gradle | 4 ++-- patches/react-native-device-info+5.6.2.patch | 25 ++++++++++++++++++++ patches/react-native-jitsi-meet+2.1.1.patch | 13 ++++++++-- 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 patches/react-native-device-info+5.6.2.patch diff --git a/android/build.gradle b/android/build.gradle index 13ea8c1ee8..27e7f0867b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { buildToolsVersion = "29.0.2" - minSdkVersion = 21 + minSdkVersion = 23 compileSdkVersion = 29 targetSdkVersion = 29 glideVersion = "4.9.0" @@ -44,7 +44,7 @@ allprojects { url("$rootDir/../node_modules/jsc-android/dist") } maven { - url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases" + url "https://github.com/RocketChat/jitsi-maven-repository/raw/libre/releases" } google() diff --git a/patches/react-native-device-info+5.6.2.patch b/patches/react-native-device-info+5.6.2.patch new file mode 100644 index 0000000000..6d6ed07635 --- /dev/null +++ b/patches/react-native-device-info+5.6.2.patch @@ -0,0 +1,25 @@ +diff --git a/node_modules/react-native-device-info/android/build.gradle b/node_modules/react-native-device-info/android/build.gradle +index ac1a9d4..8dd4d46 100644 +--- a/node_modules/react-native-device-info/android/build.gradle ++++ b/node_modules/react-native-device-info/android/build.gradle +@@ -49,13 +49,13 @@ repositories { + dependencies { + implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}" + implementation "com.android.installreferrer:installreferrer:${safeExtGet('installReferrerVersion', '1.1.2')}" +- def firebaseIidVersion = safeExtGet('firebaseIidVersion', null) +- if(firebaseIidVersion){ +- implementation "com.google.firebase:firebase-iid:$firebaseIidVersion" +- }else{ +- def iidVersion = safeExtGet('googlePlayServicesIidVersion', safeExtGet('googlePlayServicesVersion', '17.0.0')) +- implementation "com.google.android.gms:play-services-iid:$iidVersion" +- } ++ // def firebaseIidVersion = safeExtGet('firebaseIidVersion', null) ++ // if(firebaseIidVersion){ ++ // implementation "com.google.firebase:firebase-iid:$firebaseIidVersion" ++ // }else{ ++ // def iidVersion = safeExtGet('googlePlayServicesIidVersion', safeExtGet('googlePlayServicesVersion', '17.0.0')) ++ // implementation "com.google.android.gms:play-services-iid:$iidVersion" ++ // } + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' + testImplementation "org.mockito:mockito-core:3.3.3" diff --git a/patches/react-native-jitsi-meet+2.1.1.patch b/patches/react-native-jitsi-meet+2.1.1.patch index 4801e728f7..8a224c4722 100644 --- a/patches/react-native-jitsi-meet+2.1.1.patch +++ b/patches/react-native-jitsi-meet+2.1.1.patch @@ -1,13 +1,22 @@ diff --git a/node_modules/react-native-jitsi-meet/android/build.gradle b/node_modules/react-native-jitsi-meet/android/build.gradle -index 27d041a..981fa95 100644 +index 27d041a..5e398c9 100644 --- a/node_modules/react-native-jitsi-meet/android/build.gradle +++ b/node_modules/react-native-jitsi-meet/android/build.gradle +@@ -37,7 +37,7 @@ android { + + repositories { + maven { +- url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases" ++ url "https://github.com/RocketChat/jitsi-maven-repository/raw/libre/releases" + } + google() + mavenCentral() @@ -45,7 +45,14 @@ repositories { } dependencies { - implementation ('org.jitsi.react:jitsi-meet-sdk:2.4.0') { -+ implementation ('org.jitsi.react:jitsi-meet-sdk:2.9.+') { ++ implementation ('org.jitsi.react:jitsi-meet-sdk:+') { + exclude group: 'com.facebook.react', module:'react-native-vector-icons' + exclude group: 'com.facebook.react', module:'react-native-webview' + exclude group: 'com.facebook.react', module:'react-native-youtube' From 6849be1dbe5a65ce3ef74423f6dd00e60ec7c892 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Tue, 27 Oct 2020 15:25:56 -0300 Subject: [PATCH 12/19] Invalidate CI Cache --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 52531a5c36..7c506e5996 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@react-navigation/drawer": "5.8.5", "@react-navigation/native": "5.7.0", "@react-navigation/stack": "5.7.0", - "@rocket.chat/react-native-fast-image": "^8.1.5", + "@rocket.chat/react-native-fast-image": "8.1.5", "@rocket.chat/sdk": "RocketChat/Rocket.Chat.js.SDK#mobile", "@rocket.chat/ui-kit": "0.13.0", "bugsnag-react-native": "2.23.10", diff --git a/yarn.lock b/yarn.lock index 9ed8e2def6..ca812fd0ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2221,7 +2221,7 @@ resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.1.0.tgz#0e81ce56b4883b4b2a3001ebe1ab298b84237204" integrity sha512-afmTuJrylUU/0OtqzaRkbyYFFNgCF73Bvel/sw90pvGrWIZ+vyoIJqA6eMSoA6+nb443kTmulmBtC9NerXboNg== -"@rocket.chat/react-native-fast-image@^8.1.5": +"@rocket.chat/react-native-fast-image@8.1.5": version "8.1.5" resolved "https://registry.yarnpkg.com/@rocket.chat/react-native-fast-image/-/react-native-fast-image-8.1.5.tgz#325d80ebb351fb024436093b3e2add280696aba3" integrity sha512-ZjSt7NXiCkJ9KQr4b/b+mYgiwDAIGHfHdChgEU020C9sBbhSk6VxslqnfdZoAjxRW7doWMbhWkoYMjx2TnsGRw== From 79f9af369ad13f7f285529c1f2f4854191d369b4 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Thu, 29 Oct 2020 09:29:00 -0300 Subject: [PATCH 13/19] Set specific jitsi-meet-sdk --- patches/react-native-jitsi-meet+2.1.1.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/react-native-jitsi-meet+2.1.1.patch b/patches/react-native-jitsi-meet+2.1.1.patch index 8a224c4722..67fd90b7f0 100644 --- a/patches/react-native-jitsi-meet+2.1.1.patch +++ b/patches/react-native-jitsi-meet+2.1.1.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/react-native-jitsi-meet/android/build.gradle b/node_modules/react-native-jitsi-meet/android/build.gradle -index 27d041a..5e398c9 100644 +index 27d041a..41c223b 100644 --- a/node_modules/react-native-jitsi-meet/android/build.gradle +++ b/node_modules/react-native-jitsi-meet/android/build.gradle @@ -37,7 +37,7 @@ android { @@ -16,7 +16,7 @@ index 27d041a..5e398c9 100644 dependencies { - implementation ('org.jitsi.react:jitsi-meet-sdk:2.4.0') { -+ implementation ('org.jitsi.react:jitsi-meet-sdk:+') { ++ implementation ('org.jitsi.react:jitsi-meet-sdk:2.11.0-libre') { + exclude group: 'com.facebook.react', module:'react-native-vector-icons' + exclude group: 'com.facebook.react', module:'react-native-webview' + exclude group: 'com.facebook.react', module:'react-native-youtube' From e086f5cd46e0c2e88a7b31d18b03f568f1100bc1 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Fri, 30 Oct 2020 15:56:39 -0300 Subject: [PATCH 14/19] Specify 2.10.0-libre --- patches/react-native-jitsi-meet+2.1.1.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/react-native-jitsi-meet+2.1.1.patch b/patches/react-native-jitsi-meet+2.1.1.patch index 67fd90b7f0..51c2434ffc 100644 --- a/patches/react-native-jitsi-meet+2.1.1.patch +++ b/patches/react-native-jitsi-meet+2.1.1.patch @@ -16,7 +16,7 @@ index 27d041a..41c223b 100644 dependencies { - implementation ('org.jitsi.react:jitsi-meet-sdk:2.4.0') { -+ implementation ('org.jitsi.react:jitsi-meet-sdk:2.11.0-libre') { ++ implementation ('org.jitsi.react:jitsi-meet-sdk:2.10.0-libre') { + exclude group: 'com.facebook.react', module:'react-native-vector-icons' + exclude group: 'com.facebook.react', module:'react-native-webview' + exclude group: 'com.facebook.react', module:'react-native-youtube' From 1091768fbd5d4de3b0d2424bc66ad8189934c7fd Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Mon, 9 Nov 2020 11:23:57 -0300 Subject: [PATCH 15/19] jitsi-meet using an url based on play build --- android/build.gradle | 15 ++++++-- patches/react-native-jitsi-meet+2.1.1.patch | 40 -------------------- patches/react-native-jitsi-meet+2.3.1.patch | 41 +++++++++++++++++++++ 3 files changed, 52 insertions(+), 44 deletions(-) delete mode 100644 patches/react-native-jitsi-meet+2.1.1.patch create mode 100644 patches/react-native-jitsi-meet+2.3.1.patch diff --git a/android/build.gradle b/android/build.gradle index 27e7f0867b..1036e40983 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,12 @@ +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} + // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + def taskRequests = getGradle().getStartParameter().getTaskRequests().toString().toLowerCase() + def isPlay = !taskRequests.contains("foss") + ext { buildToolsVersion = "29.0.2" minSdkVersion = 23 @@ -8,7 +15,10 @@ buildscript { glideVersion = "4.9.0" kotlin_version = "1.3.50" supportLibVersion = "28.0.0" + jitsi_url = isPlay ? "https://github.com/RocketChat/jitsi-maven-repository/raw/master/releases" : "https://github.com/RocketChat/jitsi-maven-repository/raw/libre/releases" + jitsi_version = isPlay ? "+" : "2.10.0-libre" } + repositories { mavenLocal() google() @@ -18,9 +28,6 @@ buildscript { } } - def taskRequests = getGradle().getStartParameter().getTaskRequests().toString().toLowerCase() - def isPlay = !taskRequests.contains("foss") - dependencies { if (isPlay) { classpath 'com.google.gms:google-services:4.2.0' @@ -44,7 +51,7 @@ allprojects { url("$rootDir/../node_modules/jsc-android/dist") } maven { - url "https://github.com/RocketChat/jitsi-maven-repository/raw/libre/releases" + url safeExtGet("jitsi_url", "https://github.com/RocketChat/jitsi-maven-repository/raw/master/releases") } google() diff --git a/patches/react-native-jitsi-meet+2.1.1.patch b/patches/react-native-jitsi-meet+2.1.1.patch deleted file mode 100644 index 51c2434ffc..0000000000 --- a/patches/react-native-jitsi-meet+2.1.1.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/node_modules/react-native-jitsi-meet/android/build.gradle b/node_modules/react-native-jitsi-meet/android/build.gradle -index 27d041a..41c223b 100644 ---- a/node_modules/react-native-jitsi-meet/android/build.gradle -+++ b/node_modules/react-native-jitsi-meet/android/build.gradle -@@ -37,7 +37,7 @@ android { - - repositories { - maven { -- url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases" -+ url "https://github.com/RocketChat/jitsi-maven-repository/raw/libre/releases" - } - google() - mavenCentral() -@@ -45,7 +45,14 @@ repositories { - } - - dependencies { -- implementation ('org.jitsi.react:jitsi-meet-sdk:2.4.0') { -+ implementation ('org.jitsi.react:jitsi-meet-sdk:2.10.0-libre') { -+ exclude group: 'com.facebook.react', module:'react-native-vector-icons' -+ exclude group: 'com.facebook.react', module:'react-native-webview' -+ exclude group: 'com.facebook.react', module:'react-native-youtube' -+ exclude group: 'com.facebook.react', module:'react-native-community-async-storage' -+ // exclude group: 'com.facebook.react', module:'react-native-linear-gradient' -+ exclude group: 'com.facebook.react', module:'react-native-background-timer' -+ exclude group: 'com.facebook', module:'hermes' - transitive = true - } - } -diff --git a/node_modules/react-native-jitsi-meet/react-native-jitsi-meet.podspec b/node_modules/react-native-jitsi-meet/react-native-jitsi-meet.podspec -index 096c675..7e6d5d3 100644 ---- a/node_modules/react-native-jitsi-meet/react-native-jitsi-meet.podspec -+++ b/node_modules/react-native-jitsi-meet/react-native-jitsi-meet.podspec -@@ -16,5 +16,5 @@ Pod::Spec.new do |s| - s.source_files = "ios/**/*.{h,m}" - - s.dependency 'React' -- s.dependency 'JitsiMeetSDK', '2.4.0' -+ s.dependency 'JitsiMeetSDK', '2.8.1' - end diff --git a/patches/react-native-jitsi-meet+2.3.1.patch b/patches/react-native-jitsi-meet+2.3.1.patch new file mode 100644 index 0000000000..4bee0601c7 --- /dev/null +++ b/patches/react-native-jitsi-meet+2.3.1.patch @@ -0,0 +1,41 @@ +diff --git a/node_modules/react-native-jitsi-meet/android/build.gradle b/node_modules/react-native-jitsi-meet/android/build.gradle +index 1b5ac28..3169486 100644 +--- a/node_modules/react-native-jitsi-meet/android/build.gradle ++++ b/node_modules/react-native-jitsi-meet/android/build.gradle +@@ -16,6 +16,10 @@ def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3" + def DEFAULT_TARGET_SDK_VERSION = 22 + def DEFAULT_MIN_SDK_VERSION = 17 + ++def safeExtGet(prop, fallback) { ++ rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback ++} ++ + android { + compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION + buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION +@@ -37,7 +41,7 @@ android { + + repositories { + maven { +- url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases" ++ url safeExtGet("jitsi_url", "https://github.com/RocketChat/jitsi-maven-repository/raw/master/releases") + } + google() + mavenCentral() +@@ -45,13 +49,13 @@ repositories { + } + + dependencies { +- implementation ('org.jitsi.react:jitsi-meet-sdk:+') { +- exclude group: 'com.facebook.react', module:'react-native-fast-image' ++ def jitsi_version = safeExtGet("jitsi_version", "+") ++ implementation ("org.jitsi.react:jitsi-meet-sdk:$jitsi_version") { + exclude group: 'com.facebook.react', module:'react-native-vector-icons' + exclude group: 'com.facebook.react', module:'react-native-webview' +- exclude group: 'com.facebook.react', module:'react-native-background-timer' + exclude group: 'com.facebook.react', module:'react-native-youtube' + exclude group: 'com.facebook.react', module:'react-native-community-async-storage' ++ exclude group: 'com.facebook.react', module:'react-native-background-timer' + exclude group: 'com.facebook', module:'hermes' + transitive = true + } From 944cf628f5eda98db8f8d34fe01fc16cac7f0363 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Mon, 9 Nov 2020 11:28:56 -0300 Subject: [PATCH 16/19] update react-native-jitsi-meet --- patches/react-native-jitsi-meet+2.3.1.patch | 41 --------------------- yarn.lock | 4 +- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 patches/react-native-jitsi-meet+2.3.1.patch diff --git a/patches/react-native-jitsi-meet+2.3.1.patch b/patches/react-native-jitsi-meet+2.3.1.patch deleted file mode 100644 index 4bee0601c7..0000000000 --- a/patches/react-native-jitsi-meet+2.3.1.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/node_modules/react-native-jitsi-meet/android/build.gradle b/node_modules/react-native-jitsi-meet/android/build.gradle -index 1b5ac28..3169486 100644 ---- a/node_modules/react-native-jitsi-meet/android/build.gradle -+++ b/node_modules/react-native-jitsi-meet/android/build.gradle -@@ -16,6 +16,10 @@ def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3" - def DEFAULT_TARGET_SDK_VERSION = 22 - def DEFAULT_MIN_SDK_VERSION = 17 - -+def safeExtGet(prop, fallback) { -+ rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback -+} -+ - android { - compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION - buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION -@@ -37,7 +41,7 @@ android { - - repositories { - maven { -- url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases" -+ url safeExtGet("jitsi_url", "https://github.com/RocketChat/jitsi-maven-repository/raw/master/releases") - } - google() - mavenCentral() -@@ -45,13 +49,13 @@ repositories { - } - - dependencies { -- implementation ('org.jitsi.react:jitsi-meet-sdk:+') { -- exclude group: 'com.facebook.react', module:'react-native-fast-image' -+ def jitsi_version = safeExtGet("jitsi_version", "+") -+ implementation ("org.jitsi.react:jitsi-meet-sdk:$jitsi_version") { - exclude group: 'com.facebook.react', module:'react-native-vector-icons' - exclude group: 'com.facebook.react', module:'react-native-webview' -- exclude group: 'com.facebook.react', module:'react-native-background-timer' - exclude group: 'com.facebook.react', module:'react-native-youtube' - exclude group: 'com.facebook.react', module:'react-native-community-async-storage' -+ exclude group: 'com.facebook.react', module:'react-native-background-timer' - exclude group: 'com.facebook', module:'hermes' - transitive = true - } diff --git a/yarn.lock b/yarn.lock index df09d63224..c1f5ebec5a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12772,8 +12772,8 @@ react-native-iphone-x-helper@^1.0.3, react-native-iphone-x-helper@^1.2.1: integrity sha512-/VbpIEp8tSNNHIvstuA3Swx610whci1Zpc9mqNkqn14DkMbw+ORviln2u0XyHG1kPvvwTNGZY6QpeFwxYaSdbQ== react-native-jitsi-meet@RocketChat/react-native-jitsi-meet: - version "2.3.1" - resolved "https://codeload.github.com/RocketChat/react-native-jitsi-meet/tar.gz/39c2c36c82b2dbb2f80c58aa788e15b526681c65" + version "2.4.0" + resolved "https://codeload.github.com/RocketChat/react-native-jitsi-meet/tar.gz/806ea2fb24d8fce90d983766af15b9fc71b3bb9a" react-native-keyboard-input@RocketChat/react-native-keyboard-input: version "6.0.0" From bc77b4a06fa22d3d656df5ef38100a36df9f149a Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Mon, 9 Nov 2020 11:47:14 -0300 Subject: [PATCH 17/19] react-native-device-info foss --- android/build.gradle | 1 + patches/react-native-device-info+5.6.2.patch | 25 +++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 1036e40983..ae769e0c75 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -15,6 +15,7 @@ buildscript { glideVersion = "4.9.0" kotlin_version = "1.3.50" supportLibVersion = "28.0.0" + libre_build = !(isPlay.toBoolean()) jitsi_url = isPlay ? "https://github.com/RocketChat/jitsi-maven-repository/raw/master/releases" : "https://github.com/RocketChat/jitsi-maven-repository/raw/libre/releases" jitsi_version = isPlay ? "+" : "2.10.0-libre" } diff --git a/patches/react-native-device-info+5.6.2.patch b/patches/react-native-device-info+5.6.2.patch index 6d6ed07635..c679d71f26 100644 --- a/patches/react-native-device-info+5.6.2.patch +++ b/patches/react-native-device-info+5.6.2.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/react-native-device-info/android/build.gradle b/node_modules/react-native-device-info/android/build.gradle -index ac1a9d4..8dd4d46 100644 +index ac1a9d4..ab9aef8 100644 --- a/node_modules/react-native-device-info/android/build.gradle +++ b/node_modules/react-native-device-info/android/build.gradle -@@ -49,13 +49,13 @@ repositories { +@@ -49,14 +49,16 @@ repositories { dependencies { implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}" implementation "com.android.installreferrer:installreferrer:${safeExtGet('installReferrerVersion', '1.1.2')}" @@ -12,14 +12,17 @@ index ac1a9d4..8dd4d46 100644 - }else{ - def iidVersion = safeExtGet('googlePlayServicesIidVersion', safeExtGet('googlePlayServicesVersion', '17.0.0')) - implementation "com.google.android.gms:play-services-iid:$iidVersion" -- } -+ // def firebaseIidVersion = safeExtGet('firebaseIidVersion', null) -+ // if(firebaseIidVersion){ -+ // implementation "com.google.firebase:firebase-iid:$firebaseIidVersion" -+ // }else{ -+ // def iidVersion = safeExtGet('googlePlayServicesIidVersion', safeExtGet('googlePlayServicesVersion', '17.0.0')) -+ // implementation "com.google.android.gms:play-services-iid:$iidVersion" -+ // } - ++ def libreBuild = safeExtGet('libre_build', false) ++ if (!libreBuild) { ++ def firebaseIidVersion = safeExtGet('firebaseIidVersion', null) ++ if(firebaseIidVersion){ ++ implementation "com.google.firebase:firebase-iid:$firebaseIidVersion" ++ }else{ ++ def iidVersion = safeExtGet('googlePlayServicesIidVersion', safeExtGet('googlePlayServicesVersion', '17.0.0')) ++ implementation "com.google.android.gms:play-services-iid:$iidVersion" ++ } + } +- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' testImplementation "org.mockito:mockito-core:3.3.3" + } From b2e71d6696366e89bfb67a5bd12db7328e000fe5 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Mon, 9 Nov 2020 11:52:36 -0300 Subject: [PATCH 18/19] undo some unnecessary changes --- android/gradle.properties | 2 +- package.json | 2 +- yarn.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index ae29a10e13..26d0e83727 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -30,5 +30,5 @@ android.enableJetifier=true FLIPPER_VERSION=0.51.0 # App properties -VERSIONCODE=2137 +VERSIONCODE=999999999 BugsnagAPIKey="" \ No newline at end of file diff --git a/package.json b/package.json index 7809aeae70..bcd353755f 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@react-navigation/drawer": "5.8.5", "@react-navigation/native": "5.7.0", "@react-navigation/stack": "5.7.0", - "@rocket.chat/react-native-fast-image": "8.1.5", + "@rocket.chat/react-native-fast-image": "^8.1.5", "@rocket.chat/sdk": "RocketChat/Rocket.Chat.js.SDK#mobile", "@rocket.chat/ui-kit": "0.13.0", "bugsnag-react-native": "2.23.10", diff --git a/yarn.lock b/yarn.lock index c1f5ebec5a..1995ad98c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2233,7 +2233,7 @@ resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.1.0.tgz#0e81ce56b4883b4b2a3001ebe1ab298b84237204" integrity sha512-afmTuJrylUU/0OtqzaRkbyYFFNgCF73Bvel/sw90pvGrWIZ+vyoIJqA6eMSoA6+nb443kTmulmBtC9NerXboNg== -"@rocket.chat/react-native-fast-image@8.1.5": +"@rocket.chat/react-native-fast-image@^8.1.5": version "8.1.5" resolved "https://registry.yarnpkg.com/@rocket.chat/react-native-fast-image/-/react-native-fast-image-8.1.5.tgz#325d80ebb351fb024436093b3e2add280696aba3" integrity sha512-ZjSt7NXiCkJ9KQr4b/b+mYgiwDAIGHfHdChgEU020C9sBbhSk6VxslqnfdZoAjxRW7doWMbhWkoYMjx2TnsGRw== From 6fab683afa20abdcfd4dfee45556ef781c82ef1f Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Mon, 9 Nov 2020 14:27:33 -0300 Subject: [PATCH 19/19] Fix notifications --- android/app/src/play/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/play/AndroidManifest.xml b/android/app/src/play/AndroidManifest.xml index c39634d4db..9bbd460cbd 100644 --- a/android/app/src/play/AndroidManifest.xml +++ b/android/app/src/play/AndroidManifest.xml @@ -4,7 +4,7 @@ package="chat.rocket.reactnative">