From 3fd3468be598d08ac6c24b850ae0bfe1c3fde60a Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 6 Aug 2019 11:55:46 +1000
Subject: [PATCH 1/5] Fix HTTPS issue

---
 AndroidManifest.xml                        | 1 +
 res/xml/network_security_configuration.xml | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 res/xml/network_security_configuration.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index aae1965566..248d96863b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -91,6 +91,7 @@
                  android:icon="@mipmap/ic_launcher"
                  android:label="@string/app_name"
                  android:supportsRtl="true"
+                 android:networkSecurityConfig="@xml/network_security_configuration"
                  tools:replace="android:allowBackup"
                  android:allowBackup="false"
                  android:theme="@style/TextSecure.DarkTheme"
diff --git a/res/xml/network_security_configuration.xml b/res/xml/network_security_configuration.xml
new file mode 100644
index 0000000000..2ca3c5921b
--- /dev/null
+++ b/res/xml/network_security_configuration.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">imaginary.stream</domain>
+        <domain includeSubdomains="true">storage.seed1.loki.network</domain>
+        <domain includeSubdomains="true">storage.seed2.loki.network</domain>
+    </domain-config>
+</network-security-config>
\ No newline at end of file

From 90056fe6705ab6b629aa90580cb784c3e08e6347 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 6 Aug 2019 13:20:45 +1000
Subject: [PATCH 2/5] Disable experience upgrade prompts

---
 .../securesms/PassphraseRequiredActionBarActivity.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
index f296107da6..63ac891ddb 100644
--- a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
@@ -152,9 +152,11 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
       return STATE_WELCOME_SCREEN;
     } else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) {
       return STATE_PROMPT_PUSH_REGISTRATION;
-    } else if (ExperienceUpgradeActivity.isUpdate(this)) {
-      return STATE_EXPERIENCE_UPGRADE;
-    } else {
+    }
+//    else if (ExperienceUpgradeActivity.isUpdate(this)) {
+//      return STATE_EXPERIENCE_UPGRADE;
+//    }
+    else {
       return STATE_NORMAL;
     }
   }

From ac37bdd1c35a2556eb3291fd69dc1f74ff729259 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 6 Aug 2019 13:21:05 +1000
Subject: [PATCH 3/5] Update build number

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c3e03cd990..38779b450b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -192,7 +192,7 @@ android {
     }
 
     defaultConfig {
-        versionCode 4
+        versionCode 5
         versionName "1.0.0"
 
         minSdkVersion 21

From 017fae1f71ec81859be381a043a5db73dd0c0887 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 6 Aug 2019 14:20:23 +1000
Subject: [PATCH 4/5] Disable unused permissions

---
 AndroidManifest.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 248d96863b..be8b6be0f0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,12 +28,12 @@
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
 
-    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <!-- <uses-permission android:name="android.permission.RECEIVE_SMS"/>
     <uses-permission android:name="android.permission.RECEIVE_MMS"/>
     <uses-permission android:name="android.permission.READ_SMS"/>
     <uses-permission android:name="android.permission.SEND_SMS"/>
     <uses-permission android:name="android.permission.WRITE_SMS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> -->
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
@@ -82,7 +82,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
 
-    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <!-- <uses-permission android:name="android.permission.CALL_PHONE" /> -->
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>

From 932bceb82568e84e029d28672f0cb409ea7b6654 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 6 Aug 2019 14:20:36 +1000
Subject: [PATCH 5/5] Update build number

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 38779b450b..bbc92de6b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -192,7 +192,7 @@ android {
     }
 
     defaultConfig {
-        versionCode 5
+        versionCode 6
         versionName "1.0.0"
 
         minSdkVersion 21