aboutsummaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-06 04:15:40 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-06 04:15:40 +0100
commita73cc24c3f00b1e5f2fd5dc8237d8d4c699dd676 (patch)
tree3a7add992f728cd60c933c54d0de72e1d88aed6d /AndroidManifest.xml
parent1124ded2005fa5b0b9504bac383743e31212bab7 (diff)
parent0168f185ebb209dbfb69cb19bf221354c9a8561a (diff)
Merge branch 'watchdog'
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml37
1 files changed, 25 insertions, 12 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0e59383c..7855986d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,28 +9,41 @@
android:targetSdkVersion="19" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.READ_PROFILE"/>
+ <uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.WAKE_LOCK"/>
-
+ <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" />
+
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@android:style/Theme.Holo.Light" >
- <service android:name="eu.siacs.conversations.services.XmppConnectionService"/>
+ <service android:name="eu.siacs.conversations.services.XmppConnectionService" />
+
+ <receiver android:name="eu.siacs.conversations.services.EventReceiver" >
+ <intent-filter>
+ <action android:name="android.intent.action.BOOT_COMPLETED" />
+ <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+ </intent-filter>
+ </receiver>
+
<activity
android:name="eu.siacs.conversations.ui.ConversationActivity"
+ android:configChanges="orientation|screenSize"
android:label="Conversations"
- android:windowSoftInputMode="stateHidden"
- android:configChanges="orientation|screenSize">
+ android:windowSoftInputMode="stateHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
+
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
- <intent-filter>
+ <intent-filter>
<action android:name="android.intent.action.SENDTO" />
+
<category android:name="android.intent.category.DEFAULT" />
+
<data android:scheme="imto" />
<data android:host="jabber" />
</intent-filter>
@@ -45,25 +58,25 @@
android:label="Manage Accounts"
android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
</activity>
- <activity
+ <activity
android:name="eu.siacs.conversations.ui.MucDetailsActivity"
android:label="Conference Details"
- android:windowSoftInputMode="stateHidden">
+ android:windowSoftInputMode="stateHidden" >
</activity>
<activity
android:name="eu.siacs.conversations.ui.ContactDetailsActivity"
android:label="Contact Details"
- android:windowSoftInputMode="stateHidden">
+ android:windowSoftInputMode="stateHidden" >
</activity>
<activity
android:name="eu.siacs.conversations.ui.NewConversationActivity"
android:label="@string/title_activity_new_conversation"
android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
- android:windowSoftInputMode="stateHidden">
+ android:windowSoftInputMode="stateHidden" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="de.gultsch.chat.ui.ConversationActivity" />
</activity>
</application>
-</manifest>
+</manifest> \ No newline at end of file