From f4801c1cc91f38d86ea8158b1d32533bdc4db5d6 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Fri, 27 Apr 2018 01:09:16 -0300
Subject: [PATCH] Fabric fix and location removed (#286)
* Proguard disabled
---
android/app/build.gradle | 18 +++++++++---------
android/app/src/main/AndroidManifest.xml | 2 +-
ios/RocketChatRN/Info.plist | 2 --
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index a00e48c83..793040f61 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -82,12 +82,12 @@ apply from: "../../node_modules/react-native/react.gradle"
* Upload all the APKs to the Play Store and people will download
* the correct one based on the CPU architecture of their device.
*/
-def enableSeparateBuildPerCPUArchitecture = true
+def enableSeparateBuildPerCPUArchitecture = false
/**
* Run Proguard to shrink the Java bytecode in release builds.
*/
-def enableProguardInReleaseBuilds = true
+def enableProguardInReleaseBuilds = false
android {
compileSdkVersion 25
@@ -124,16 +124,16 @@ android {
}
buildTypes {
release {
- signingConfig signingConfigs.release
- shrinkResources enableProguardInReleaseBuilds
- zipAlignEnabled enableProguardInReleaseBuilds
+ // shrinkResources enableProguardInReleaseBuilds
+ // zipAlignEnabled enableProguardInReleaseBuilds
+ // useProguard enableProguardInReleaseBuilds
minifyEnabled enableProguardInReleaseBuilds
- useProguard enableProguardInReleaseBuilds
setProguardFiles([getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'])
+ signingConfig signingConfigs.release
+ }
+ debug {
+ applicationIdSuffix ".debug"
}
- debug {
- applicationIdSuffix ".debug"
- }
}
// applicationVariants are e.g. debug, release
applicationVariants.all { variant ->
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c61f8cd8c..ec1522f83 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.RECORD_AUDIO" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.VIBRATE"/>
diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist
index 9a7c650b0..18e208096 100644
--- a/ios/RocketChatRN/Info.plist
+++ b/ios/RocketChatRN/Info.plist
@@ -53,8 +53,6 @@
</dict>
<key>NSCameraUsageDescription</key>
<string>Upload images from camera</string>
- <key>NSLocationWhenInUseUsageDescription</key>
- <string></string>
<key>NSMicrophoneUsageDescription</key>
<string>This app uses the microphone to record audio message.</string>
<key>NSPhotoLibraryUsageDescription</key>
--
GitLab