diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-03-12 20:58:37 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-03-12 20:58:37 +0100 |
commit | f5854d238e4c8aecb5370e56301bd43015ad8ba9 (patch) | |
tree | 4fb9ac1b5741911a03a2345289945b476c14b245 /src/main/AndroidManifest.xml | |
parent | 89927cee8ed577e8b285de26e6b7c424e83735f4 (diff) |
integrate trust manager into conversations
Diffstat (limited to 'src/main/AndroidManifest.xml')
-rw-r--r-- | src/main/AndroidManifest.xml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index be3311ebf..5f59388b8 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -238,10 +238,6 @@ 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=".ui.AboutActivity" android:label="@string/title_activity_about" android:parentActivityName=".ui.SettingsActivity"> @@ -256,11 +252,8 @@ android:launchMode="singleTask" android:theme="@style/ConversationsTheme"> </activity> - <activity - android:name="com.soundcloud.android.crop.CropImageActivity"> - </activity> - - <service android:name=".services.UpdateService" /> + <activity android:name="com.soundcloud.android.crop.CropImageActivity" /> + <activity android:name=".ui.MemorizingActivity" /> <service android:name=".services.ExportLogsService" /> <service android:name=".services.ContactChooserTargetService" |