moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-30 20:52:21 -05:00
Code Issues Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Daniel Gultsch 2014-03-13 21:45:38 +01:00
parent 9c811f8fb2
commit bf7bba0311
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
AndroidManifest.xml
View File

@ -69,12 +69,6 @@
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value="de.gultsch.chat.ui.ConversationActivity" /> 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> <intent-filter>
<action android:name="android.intent.action.SENDTO" /> <action android:name="android.intent.action.SENDTO" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@ -82,6 +76,17 @@
<data android:host="jabber" /> <data android:host="jabber" />
</intent-filter> </intent-filter>
</activity> </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> </application>
</manifest> </manifest>

2
src/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -928,7 +928,7 @@ public class XmppConnectionService extends Service {
public void deleteAccount(Account account) { public void deleteAccount(Account account) {
Log.d(LOGTAG, "called delete account"); Log.d(LOGTAG, "called delete account");
if (account.getXmppConnection() != null) { if (account.getXmppConnection() != null) {
this.disconnect(account, false); this.disconnect(account, true);
} }
databaseBackend.deleteAccount(account); databaseBackend.deleteAccount(account);
this.accounts.remove(account); this.accounts.remove(account);