aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/AndroidManifest.xml')
-rw-r--r--src/main/AndroidManifest.xml38
1 files changed, 25 insertions, 13 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 325459850..3e048b25c 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest
- package="eu.siacs.conversations"
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ package="eu.siacs.conversations" >
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -29,10 +28,15 @@
<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.media.RINGER_MODE_CHANGED"/>
+ <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.MY_PACKAGE_REPLACED" />
+ <action android:name="android.media.RINGER_MODE_CHANGED" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.PACKAGE_REPLACED" />
+ <data android:scheme="package" android:path="eu.siacs.conversations" />
</intent-filter>
</receiver>
@@ -52,7 +56,7 @@
android:name=".ui.StartConversationActivity"
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_start_conversation"
- android:launchMode="singleTask">
+ android:launchMode="singleTask" >
<intent-filter>
<action android:name="android.intent.action.SENDTO"/>
@@ -145,11 +149,11 @@
<activity
android:name=".ui.TrustKeysActivity"
android:label="@string/trust_omemo_fingerprints"
- android:windowSoftInputMode="stateAlwaysHidden"/>
+ android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name="de.duenndns.ssl.MemorizingActivity"
android:theme="@style/ConversationsTheme"
- tools:replace="android:theme"/>
+ tools:replace="android:theme" />
<activity
android:name=".ui.AboutActivity"
android:label="@string/title_activity_about"
@@ -158,8 +162,16 @@
android:name="android.support.PARENT_ACTIVITY"
android:value="eu.siacs.conversations.ui.SettingsActivity"/>
</activity>
-
- <service android:name=".services.ExportLogsService"/>
+ <activity
+ android:name=".ui.UpdaterActivity"
+ android:configChanges="orientation|screenSize"
+ android:launchMode="singleTask"
+ android:theme="@style/ConversationsTheme"
+ android:label="@string/title_activity_updater" >
+ </activity>
+ <service android:name=".services.UpdaterWebService" />
+ <service android:name=".services.CheckAppVersionService" />
+ <service android:name=".services.ExportLogsService" />
</application>
</manifest>