diff options
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a7bfbbe4..44bfd18d 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="19" - android:versionName="0.4.1" > + android:versionCode="20" + android:versionName="0.5-beta" > <uses-sdk android:minSdkVersion="14" @@ -49,11 +49,11 @@ </intent-filter> </activity> <activity - android:name="eu.siacs.conversations.ui.StartConversation" + android:name="eu.siacs.conversations.ui.StartConversationActivity" android:configChanges="orientation|screenSize" android:label="@string/title_activity_start_conversation" android:logo="@drawable/ic_activity" - android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"> + android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" > <intent-filter> <action android:name="android.intent.action.SENDTO" /> @@ -68,6 +68,9 @@ android:label="@string/title_activity_settings" android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" > </activity> + <activity android:name="eu.siacs.conversations.ui.ChooseContactActivity" + android:label="@string/title_activity_choose_contact"> + </activity> <activity android:name="eu.siacs.conversations.ui.ManageAccountActivity" android:configChanges="orientation|screenSize" @@ -75,7 +78,7 @@ android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" > </activity> <activity - android:name="eu.siacs.conversations.ui.MucDetailsActivity" + android:name="eu.siacs.conversations.ui.ConferenceDetailsActivity" android:label="@string/title_activity_conference_details" android:windowSoftInputMode="stateHidden" > </activity> @@ -102,6 +105,7 @@ <data android:mimeType="image/*" /> </intent-filter> </activity> + <activity android:name="de.duenndns.ssl.MemorizingActivity" /> </application> -</manifest>
\ No newline at end of file +</manifest> |