From 37d08276a866aa943bfb6022732618e9fc37653b Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 11 Apr 2015 14:53:10 +0200
Subject: allow sharing multiple images at once. fixes #1090

---
 src/main/AndroidManifest.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/main/AndroidManifest.xml')

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index e4e91d80..9fe37017 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -122,6 +122,13 @@
 
                 <data android:mimeType="*/*" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="image/*" />
+            </intent-filter>
         </activity>
         <activity
             android:name="de.duenndns.ssl.MemorizingActivity"
-- 
cgit v1.2.3


From 14010bf5a6198e4e53ba3f86328d061cf20b8da1 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sun, 19 Jul 2015 18:36:28 +0200
Subject: Ask for key trust when sending messages

If the contact (or the own account) has keys that have UNDECIDED trust,
we now drop the user into the new TrustKeysActivity, where they have to
decide for each new key whether it should be TRUSTED or UNTRUSTED.
---
 src/main/AndroidManifest.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/AndroidManifest.xml')

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 9fe37017..b0611f84 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -130,6 +130,10 @@
                 <data android:mimeType="image/*" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.TrustKeysActivity"
+            android:label="@string/trust_keys"
+            android:windowSoftInputMode="stateAlwaysHidden"/>
         <activity
             android:name="de.duenndns.ssl.MemorizingActivity"
             android:theme="@style/ConversationsTheme"
-- 
cgit v1.2.3


From 8b9b74ff7ee863160e0cf2827e2a5a431d4fb90f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 8 Aug 2015 13:29:21 +0200
Subject: renamed multi-end / axolotl to OMEMO

---
 src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/AndroidManifest.xml')

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b0611f84..15d5bc25 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -132,7 +132,7 @@
         </activity>
         <activity
             android:name=".ui.TrustKeysActivity"
-            android:label="@string/trust_keys"
+            android:label="@string/trust_omemo_fingerprints"
             android:windowSoftInputMode="stateAlwaysHidden"/>
         <activity
             android:name="de.duenndns.ssl.MemorizingActivity"
-- 
cgit v1.2.3


From c0502c2165305a0370bc16f3a847ec2760fe70b9 Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Sun, 23 Aug 2015 12:39:20 +0200
Subject: remove the READ_PHONE_STATE permission.

---
 src/main/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/AndroidManifest.xml')

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 15d5bc25..7f07a39c 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -15,6 +15,8 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.NFC" />
 
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove" />
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-- 
cgit v1.2.3