From 9b4609c15a12f4d8e37108d2663181bbe900a3e4 Mon Sep 17 00:00:00 2001
From: Alevs <ac1298@mail.ru>
Date: Tue, 21 Nov 2017 23:45:04 +0300
Subject: [PATCH] add zero noise option and fix bugs

---
 android/app/build.gradle                 |  15 +++++++++++++--
 android/app/my-release-key.keystore      | Bin 0 -> 2275 bytes
 android/gradle.properties                |   4 ++++
 src/components/Chat/ChatContainer.js     |   2 +-
 src/components/Settings/SettingsModal.js |   1 +
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 android/app/my-release-key.keystore

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 738c764..2717856 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -101,12 +101,22 @@ android {
         applicationId "com.magic_messenger"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
     }
+    signingConfigs {
+        release {
+            if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) {
+                storeFile file(MYAPP_RELEASE_STORE_FILE)
+                storePassword MYAPP_RELEASE_STORE_PASSWORD
+                keyAlias MYAPP_RELEASE_KEY_ALIAS
+                keyPassword MYAPP_RELEASE_KEY_PASSWORD
+            }
+        }
+    }
     splits {
         abi {
             reset()
@@ -119,6 +129,7 @@ android {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            signingConfig signingConfigs.release
         }
     }
     // applicationVariants are e.g. debug, release
diff --git a/android/app/my-release-key.keystore b/android/app/my-release-key.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..983477fe7ef3bc38815f06579ff306e9d3c40ffa
GIT binary patch
literal 2275
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

literal 0
HcmV?d00001

diff --git a/android/gradle.properties b/android/gradle.properties
index 1fd964e..e41a0eb 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -18,3 +18,7 @@
 # org.gradle.parallel=true
 
 android.useDeprecatedNdk=true
+MYAPP_RELEASE_STORE_FILE=my-release-key.keystore
+MYAPP_RELEASE_KEY_ALIAS=my-key-alias
+MYAPP_RELEASE_STORE_PASSWORD=panarepan2010
+MYAPP_RELEASE_KEY_PASSWORD=panarepan2010
\ No newline at end of file
diff --git a/src/components/Chat/ChatContainer.js b/src/components/Chat/ChatContainer.js
index 434293b..a671742 100644
--- a/src/components/Chat/ChatContainer.js
+++ b/src/components/Chat/ChatContainer.js
@@ -22,7 +22,7 @@ export default class ChatContainer extends React.Component {
         settings:{
             codingAlgo: 'hamming',
             compressionAlgo: 'arithmetic',
-            noiseLevel: '1',
+            noiseLevel: '0',
         },
     };
 
diff --git a/src/components/Settings/SettingsModal.js b/src/components/Settings/SettingsModal.js
index 21e9ebb..06428df 100644
--- a/src/components/Settings/SettingsModal.js
+++ b/src/components/Settings/SettingsModal.js
@@ -37,6 +37,7 @@ export default class SettingsModal extends Component {
                         <Picker
                             selectedValue={this.props.settings.noiseLevel}
                             onValueChange={(itemValue) => this.props.setSettings({noiseLevel: itemValue})}>
+                            <Picker.Item label="no noise" value="0" />
                             <Picker.Item label="1%" value="1" />
                             <Picker.Item label="5%" value="5" />
                             <Picker.Item label="15%" value="15" />