diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-03-13 21:45:38 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-03-13 21:45:38 +0100 |
| commit | bf7bba03112993808d98656e6a4aea4d2493062a (patch) | |
| tree | 45a2b6774d237e29219945b2ae9d51d322b26a31 | |
| parent | 9c811f8fb20b056ea12803e93e5ea20dc052bdcd (diff) | |
bug fix
| -rw-r--r-- | AndroidManifest.xml | 17 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4e5042c1..3b598426 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -69,12 +69,6 @@ <meta-data android:name="android.support.PARENT_ACTIVITY" android:value="de.gultsch.chat.ui.ConversationActivity" /> - - <intent-filter> - <action android:name="android.intent.action.SEND" /> - <category android:name="android.intent.category.DEFAULT" /> - <data android:mimeType="text/plain" /> - </intent-filter> <intent-filter> <action android:name="android.intent.action.SENDTO" /> <category android:name="android.intent.category.DEFAULT" /> @@ -82,6 +76,17 @@ <data android:host="jabber" /> </intent-filter> </activity> + <activity + android:name="eu.siacs.conversations.ui.ShareWithActivity" + android:label="Conversations" + android:theme="@android:style/Theme.Holo.Light.DialogWhenLarge" + android:icon="@drawable/ic_launcher"> + <intent-filter> + <action android:name="android.intent.action.SEND" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:mimeType="text/plain" /> + </intent-filter> + </activity> </application> </manifest>
\ No newline at end of file diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index 9a5cbc0c..bc574fba 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -928,7 +928,7 @@ public class XmppConnectionService extends Service { public void deleteAccount(Account account) { Log.d(LOGTAG, "called delete account"); if (account.getXmppConnection() != null) { - this.disconnect(account, false); + this.disconnect(account, true); } databaseBackend.deleteAccount(account); this.accounts.remove(account); |