Merge branch 'trz/rebase' into trz/rename

1 files changed, 94 insertions, 71 deletions

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 5ef50e48..04f1bc33 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -5,16 +5,21 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_PROFILE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.READ_PROFILE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.NFC"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+
+    <uses-permission
+        android:name="android.permission.READ_PHONE_STATE"
+        tools:node="remove"/>
 
     <application
         android:allowBackup="true"
@@ -22,136 +27,154 @@
         android:label="@string/app_name"
         android:theme="@style/ConversationsTheme"
         tools:replace="android:label"
-        android:name=".ConversationsPlusApplication">
-        <service android:name="de.thedevstack.conversationsplus.services.XmppConnectionService" />
+        android:name="de.thedevstack.conversationsplus.ConversationsPlusApplication">
+        <service android:name=".services.XmppConnectionService" />
 
-        <receiver android:name="de.thedevstack.conversationsplus.services.EventReceiver" >
+        <receiver android:name=".services.EventReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-                <action android:name="android.intent.action.ACTION_SHUTDOWN" />
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+                <action android:name="android.intent.action.ACTION_SHUTDOWN"/>
+                <action android:name="android.media.RINGER_MODE_CHANGED"/>
             </intent-filter>
         </receiver>
 
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.ConversationActivity"
+            android:name=".ui.ConversationActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.StartConversationActivity"
+            android:name=".ui.StartConversationActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/title_activity_start_conversation" >
+            android:label="@string/title_activity_start_conversation"
+            android:launchMode="singleTask">
             <intent-filter>
-                <action android:name="android.intent.action.SENDTO" />
+                <action android:name="android.intent.action.SENDTO"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT"/>
 
-                <data android:scheme="imto" />
-                <data android:host="jabber" />
+                <data android:scheme="imto"/>
+                <data android:host="jabber"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.VIEW"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
 
-                <data android:scheme="xmpp" />
+                <data android:scheme="xmpp"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT"/>
 
-                <data android:scheme="xmpp" />
+                <data android:scheme="xmpp"/>
             </intent-filter>
         </activity>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.SettingsActivity"
-            android:label="@string/title_activity_settings" />
+            android:name=".ui.SettingsActivity"
+            android:label="@string/title_activity_settings"/>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.ChooseContactActivity"
-            android:label="@string/title_activity_choose_contact" />
+            android:name=".ui.ChooseContactActivity"
+            android:label="@string/title_activity_choose_contact"/>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.BlocklistActivity"
-            android:label="@string/title_activity_block_list" />
-	    <activity
-		    android:name="de.thedevstack.conversationsplus.ui.ChangePasswordActivity"
-		    android:label="@string/change_password_on_server" />
+            android:name=".ui.BlocklistActivity"
+            android:label="@string/title_activity_block_list"/>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.ManageAccountActivity"
-            android:configChanges="orientation|screenSize"
-            android:label="@string/title_activity_manage_accounts" />
+            android:name=".ui.ChangePasswordActivity"
+            android:label="@string/change_password_on_server"/>
+        <activity
+            android:name=".ui.ManageAccountActivity"
+            android:label="@string/title_activity_manage_accounts"
+            android:launchMode="singleTask"/>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.EditAccountActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
+            android:name=".ui.EditAccountActivity"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="stateHidden|adjustResize"/>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.ConferenceDetailsActivity"
+            android:name=".ui.ConferenceDetailsActivity"
             android:label="@string/title_activity_conference_details"
-            android:windowSoftInputMode="stateHidden" />
+            android:windowSoftInputMode="stateHidden"/>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.ContactDetailsActivity"
+            android:name=".ui.ContactDetailsActivity"
             android:label="@string/title_activity_contact_details"
-            android:windowSoftInputMode="stateHidden" />
+            android:windowSoftInputMode="stateHidden"/>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.PublishProfilePictureActivity"
+            android:name=".ui.PublishProfilePictureActivity"
             android:label="@string/mgmt_account_publish_avatar"
-            android:windowSoftInputMode="stateHidden" />
+            android:windowSoftInputMode="stateHidden"/>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.VerifyOTRActivity"
+            android:name=".ui.VerifyOTRActivity"
             android:label="@string/verify_otr"
-            android:windowSoftInputMode="stateHidden" />
+            android:windowSoftInputMode="stateHidden"/>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.ShareWithActivity"
-            android:label="@string/app_name" >
+            android:name=".ui.ShareWithActivity"
+            android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.SEND"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT"/>
 
-                <data android:mimeType="text/plain" />
+                <data android:mimeType="text/plain"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.SEND"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT"/>
 
-                <data android:mimeType="*/*" />
+                <data android:mimeType="*/*"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <action android:name="android.intent.action.SEND_MULTIPLE"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT"/>
 
-                <data android:mimeType="image/*" />
+                <data android:mimeType="image/*"/>
             </intent-filter>
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value=".services.ContactChooserTargetService" />
         </activity>
         <activity
+            android:name=".ui.TrustKeysActivity"
+            android:label="@string/trust_omemo_fingerprints"
+            android:windowSoftInputMode="stateAlwaysHidden"/>
+        <activity
             android:name="de.duenndns.ssl.MemorizingActivity"
             android:theme="@style/ConversationsTheme"
             tools:replace="android:theme"/>
         <activity
-            android:name="de.thedevstack.conversationsplus.ui.AboutActivity"
+            android:name=".ui.AboutActivity"
             android:label="@string/title_activity_about"
-            android:parentActivityName="de.thedevstack.conversationsplus.ui.SettingsActivity" >
+            android:parentActivityName=".ui.SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.thedevstack.conversationsplus.ui.SettingsActivity" />
+                android:value=".ui.SettingsActivity"/>
         </activity>
         <activity
             android:name="de.thedevstack.conversationsplus.ui.LogCatOutputActivity"
             android:label="@string/title_activity_loginformation"
-            android:parentActivityName="de.thedevstack.conversationsplus.ui.SettingsActivity" >
+            android:parentActivityName=".ui.SettingsActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.thedevstack.conversationsplus.ui.SettingsActivity" />
+                android:value=".ui.SettingsActivity" />
         </activity>
+        <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
+        <service android:name=".services.ExportLogsService"/>
+        <service android:name=".services.ContactChooserTargetService"
+                 android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.chooser.ChooserTargetService" />
+            </intent-filter>
+        </service>
     </application>
 
 </manifest>