1 files changed, 16 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8c90d092..97a27abb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="eu.siacs.conversations"
-    android:versionCode="11"
-    android:versionName="0.2" >
+    android:versionCode="16"
+    android:versionName="0.3" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -32,14 +32,16 @@
             <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" />
             </intent-filter>
         </receiver>
 
         <activity
             android:name="eu.siacs.conversations.ui.ConversationActivity"
             android:configChanges="orientation|screenSize"
-            android:label="Conversations"
-            android:windowSoftInputMode="stateHidden" >
+            android:label="@string/title_activity_conversations"
+            android:windowSoftInputMode="stateHidden"
+            android:launchMode="singleTask" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -48,23 +50,23 @@
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.SettingsActivity"
-            android:label="Settings"
+            android:label="@string/title_activity_settings"
             android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ManageAccountActivity"
-            android:label="Manage Accounts"
+            android:label="@string/title_activity_manage_accounts"
             android:configChanges="orientation|screenSize"
             android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.MucDetailsActivity"
-            android:label="Conference Details"
+            android:label="@string/title_activity_conference_details"
             android:windowSoftInputMode="stateHidden" >
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ContactDetailsActivity"
-            android:label="Contact Details"
+            android:label="@string/title_activity_contact_details"
             android:windowSoftInputMode="stateHidden" >
         </activity>
         <activity
@@ -84,7 +86,7 @@
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ShareWithActivity"
-            android:label="Conversations"
+            android:label="@string/title_activity_conversations"
             android:theme="@android:style/Theme.Holo.Light.DialogWhenLarge"
             android:icon="@drawable/ic_launcher">
             <intent-filter>
@@ -92,6 +94,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/plain" />
             </intent-filter>
+             <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
         </activity>
     </application>