diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 28640fc7062c9123d0d772ea1cc36921f18bdd26..d511bef57360eb324c3771c1b774a3450cb38537 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -18,10 +18,10 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.Light" > - + @@ -36,19 +36,19 @@ + android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" > + android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" > + android:showAsAction="ifRoom" + android:icon="@drawable/ic_action_person" + android:title="@string/action_contact_details" /> + - Secure Conversations + Conversations Settings New conversation Manage accounts Archive conversation - Contact details + Contact details + Conferenece details Secure conversation Add account New Conversation diff --git a/src/de/gultsch/chat/crypto/OtrEngine.java b/src/eu/siacs/conversations/crypto/OtrEngine.java similarity index 96% rename from src/de/gultsch/chat/crypto/OtrEngine.java rename to src/eu/siacs/conversations/crypto/OtrEngine.java index cdd71d61b508c4f11a331c92a1353f08d71b991c..eca01a7365283b25e0fc1272430ca181827dd6cb 100644 --- a/src/de/gultsch/chat/crypto/OtrEngine.java +++ b/src/eu/siacs/conversations/crypto/OtrEngine.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.crypto; +package eu.siacs.conversations.crypto; import java.math.BigInteger; import java.security.KeyFactory; @@ -17,10 +17,10 @@ import org.json.JSONObject; import android.content.Context; import android.util.Log; -import de.gultsch.chat.entities.Account; -import de.gultsch.chat.persistance.DatabaseBackend; -import de.gultsch.chat.xml.Element; -import de.gultsch.chat.xmpp.MessagePacket; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.persistance.DatabaseBackend; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.MessagePacket; import net.java.otr4j.OtrEngineHost; import net.java.otr4j.OtrException; diff --git a/src/de/gultsch/chat/crypto/PgpEngine.java b/src/eu/siacs/conversations/crypto/PgpEngine.java similarity index 99% rename from src/de/gultsch/chat/crypto/PgpEngine.java rename to src/eu/siacs/conversations/crypto/PgpEngine.java index 6d94e577f7c88c62e19c2f6dea6d15781cb9da56..ba000c045d0e2f477045ca82346564c0d6bd8e32 100644 --- a/src/de/gultsch/chat/crypto/PgpEngine.java +++ b/src/eu/siacs/conversations/crypto/PgpEngine.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.crypto; +package eu.siacs.conversations.crypto; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/de/gultsch/chat/entities/AbstractEntity.java b/src/eu/siacs/conversations/entities/AbstractEntity.java similarity index 92% rename from src/de/gultsch/chat/entities/AbstractEntity.java rename to src/eu/siacs/conversations/entities/AbstractEntity.java index 31a19fc0b847492969131315c82077477c6d4dc3..0297fa662bd45d0a1fcc3f24d0487033c609e4a3 100644 --- a/src/de/gultsch/chat/entities/AbstractEntity.java +++ b/src/eu/siacs/conversations/entities/AbstractEntity.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.entities; +package eu.siacs.conversations.entities; import java.io.Serializable; diff --git a/src/de/gultsch/chat/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java similarity index 97% rename from src/de/gultsch/chat/entities/Account.java rename to src/eu/siacs/conversations/entities/Account.java index c8f6d06390157c689b0af29e0b29ee7d7ea946d7..a596aba152b851c728aea2e3be84d55906eea391 100644 --- a/src/de/gultsch/chat/entities/Account.java +++ b/src/eu/siacs/conversations/entities/Account.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.entities; +package eu.siacs.conversations.entities; import java.security.interfaces.DSAPublicKey; @@ -8,8 +8,8 @@ import net.java.otr4j.crypto.OtrCryptoException; import org.json.JSONException; import org.json.JSONObject; -import de.gultsch.chat.crypto.OtrEngine; -import de.gultsch.chat.xmpp.XmppConnection; +import eu.siacs.conversations.crypto.OtrEngine; +import eu.siacs.conversations.xmpp.XmppConnection; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; diff --git a/src/de/gultsch/chat/entities/Contact.java b/src/eu/siacs/conversations/entities/Contact.java similarity index 98% rename from src/de/gultsch/chat/entities/Contact.java rename to src/eu/siacs/conversations/entities/Contact.java index a8c9fa621d3655d99b69a86374b3e1d80f8a664a..0eed39ed274ec2eeeae50ce037e3765271b6353e 100644 --- a/src/de/gultsch/chat/entities/Contact.java +++ b/src/eu/siacs/conversations/entities/Contact.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.entities; +package eu.siacs.conversations.entities; import java.io.Serializable; import java.util.HashSet; @@ -9,7 +9,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import de.gultsch.chat.xml.Element; +import eu.siacs.conversations.xml.Element; import android.content.ContentValues; import android.database.Cursor; diff --git a/src/de/gultsch/chat/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java similarity index 94% rename from src/de/gultsch/chat/entities/Conversation.java rename to src/eu/siacs/conversations/entities/Conversation.java index 3f83010ce194a6ec4656388146d595360f1acc11..d1186a7d274bba9f3a88f4822d4b74d91a2c6562 100644 --- a/src/de/gultsch/chat/entities/Conversation.java +++ b/src/eu/siacs/conversations/entities/Conversation.java @@ -1,11 +1,11 @@ -package de.gultsch.chat.entities; +package eu.siacs.conversations.entities; import java.security.interfaces.DSAPublicKey; import java.util.ArrayList; import java.util.List; -import de.gultsch.chat.crypto.OtrEngine; -import de.gultsch.chat.xmpp.XmppConnection; +import eu.siacs.conversations.crypto.OtrEngine; +import eu.siacs.conversations.xmpp.XmppConnection; import net.java.otr4j.OtrException; import net.java.otr4j.crypto.OtrCryptoEngineImpl; @@ -59,6 +59,8 @@ public class Conversation extends AbstractEntity { public int nextMessageEncryption = Message.ENCRYPTION_NONE; + private transient MucOptions mucOptions = null; + public Conversation(String name, Account account, String contactJid, int mode) { this(java.util.UUID.randomUUID().toString(), name, null, account.getUuid(), contactJid, System @@ -268,4 +270,15 @@ public class Conversation extends AbstractEntity { } return this.otrFingerprint; } + + public MucOptions getMucOptions() { + if (this.mucOptions == null) { + this.mucOptions = new MucOptions(); + } + return this.mucOptions ; + } + + public void resetMucOptions() { + this.mucOptions = null; + } } diff --git a/src/de/gultsch/chat/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java similarity index 98% rename from src/de/gultsch/chat/entities/Message.java rename to src/eu/siacs/conversations/entities/Message.java index 58e4ef63aeeda8a059bf11047b917c3b3bfb0a63..0fce2a5b628158b38a2d2e3e4bedbc40bc6870c2 100644 --- a/src/de/gultsch/chat/entities/Message.java +++ b/src/eu/siacs/conversations/entities/Message.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; diff --git a/src/eu/siacs/conversations/entities/MucOptions.java b/src/eu/siacs/conversations/entities/MucOptions.java new file mode 100644 index 0000000000000000000000000000000000000000..4a738e65ccd3a0f272de24ac8fd3b9489e2f6a66 --- /dev/null +++ b/src/eu/siacs/conversations/entities/MucOptions.java @@ -0,0 +1,5 @@ +package eu.siacs.conversations.entities; + +public class MucOptions { + +} diff --git a/src/de/gultsch/chat/entities/Presences.java b/src/eu/siacs/conversations/entities/Presences.java similarity index 97% rename from src/de/gultsch/chat/entities/Presences.java rename to src/eu/siacs/conversations/entities/Presences.java index aabc844049cb91b979a0037a993e7b98b43a5fe8..af7926a8b11ee9c66fa4e8e5151396df5c1c0e5a 100644 --- a/src/de/gultsch/chat/entities/Presences.java +++ b/src/eu/siacs/conversations/entities/Presences.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.entities; +package eu.siacs.conversations.entities; import java.util.Hashtable; import java.util.Iterator; diff --git a/src/de/gultsch/chat/persistance/DatabaseBackend.java b/src/eu/siacs/conversations/persistance/DatabaseBackend.java similarity index 97% rename from src/de/gultsch/chat/persistance/DatabaseBackend.java rename to src/eu/siacs/conversations/persistance/DatabaseBackend.java index 18fad7c426bec587b970cc467bb635ce9dae8d60..1a6f934a74f4683c7590c29473fbce7dd57bac91 100644 --- a/src/de/gultsch/chat/persistance/DatabaseBackend.java +++ b/src/eu/siacs/conversations/persistance/DatabaseBackend.java @@ -1,14 +1,14 @@ -package de.gultsch.chat.persistance; +package eu.siacs.conversations.persistance; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import de.gultsch.chat.entities.Account; -import de.gultsch.chat.entities.Contact; -import de.gultsch.chat.entities.Conversation; -import de.gultsch.chat.entities.Message; -import de.gultsch.chat.entities.Presences; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Presences; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; diff --git a/src/de/gultsch/chat/persistance/OnPhoneContactsMerged.java b/src/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java similarity index 64% rename from src/de/gultsch/chat/persistance/OnPhoneContactsMerged.java rename to src/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java index a7918efb9787c9a3fc3bdae757970e2990d4cdcc..6a457b17f9e66d22243c26c30bb5268c72520175 100644 --- a/src/de/gultsch/chat/persistance/OnPhoneContactsMerged.java +++ b/src/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.persistance; +package eu.siacs.conversations.persistance; public interface OnPhoneContactsMerged { public void phoneContactsMerged(); diff --git a/src/de/gultsch/chat/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java similarity index 87% rename from src/de/gultsch/chat/services/XmppConnectionService.java rename to src/eu/siacs/conversations/services/XmppConnectionService.java index 7ff09957395acbcaf21cfbc9f04898c11dd13e4c..218d5088b77ac8a881a3d8cb43f6a82961c1b30a 100644 --- a/src/de/gultsch/chat/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.services; +package eu.siacs.conversations.services; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -14,31 +14,31 @@ import net.java.otr4j.OtrException; import net.java.otr4j.session.Session; import net.java.otr4j.session.SessionStatus; -import de.gultsch.chat.crypto.PgpEngine; -import de.gultsch.chat.crypto.PgpEngine.OpenPgpException; -import de.gultsch.chat.entities.Account; -import de.gultsch.chat.entities.Contact; -import de.gultsch.chat.entities.Conversation; -import de.gultsch.chat.entities.Message; -import de.gultsch.chat.entities.Presences; -import de.gultsch.chat.persistance.DatabaseBackend; -import de.gultsch.chat.persistance.OnPhoneContactsMerged; -import de.gultsch.chat.ui.OnAccountListChangedListener; -import de.gultsch.chat.ui.OnConversationListChangedListener; -import de.gultsch.chat.ui.OnRosterFetchedListener; -import de.gultsch.chat.utils.MessageParser; -import de.gultsch.chat.utils.OnPhoneContactsLoadedListener; -import de.gultsch.chat.utils.PhoneHelper; -import de.gultsch.chat.utils.UIHelper; -import de.gultsch.chat.xml.Element; -import de.gultsch.chat.xmpp.IqPacket; -import de.gultsch.chat.xmpp.MessagePacket; -import de.gultsch.chat.xmpp.OnIqPacketReceived; -import de.gultsch.chat.xmpp.OnMessagePacketReceived; -import de.gultsch.chat.xmpp.OnPresencePacketReceived; -import de.gultsch.chat.xmpp.OnStatusChanged; -import de.gultsch.chat.xmpp.PresencePacket; -import de.gultsch.chat.xmpp.XmppConnection; +import eu.siacs.conversations.crypto.PgpEngine; +import eu.siacs.conversations.crypto.PgpEngine.OpenPgpException; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Presences; +import eu.siacs.conversations.persistance.DatabaseBackend; +import eu.siacs.conversations.persistance.OnPhoneContactsMerged; +import eu.siacs.conversations.ui.OnAccountListChangedListener; +import eu.siacs.conversations.ui.OnConversationListChangedListener; +import eu.siacs.conversations.ui.OnRosterFetchedListener; +import eu.siacs.conversations.utils.MessageParser; +import eu.siacs.conversations.utils.OnPhoneContactsLoadedListener; +import eu.siacs.conversations.utils.PhoneHelper; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.IqPacket; +import eu.siacs.conversations.xmpp.MessagePacket; +import eu.siacs.conversations.xmpp.OnIqPacketReceived; +import eu.siacs.conversations.xmpp.OnMessagePacketReceived; +import eu.siacs.conversations.xmpp.OnPresencePacketReceived; +import eu.siacs.conversations.xmpp.OnStatusChanged; +import eu.siacs.conversations.xmpp.PresencePacket; +import eu.siacs.conversations.xmpp.XmppConnection; import android.app.NotificationManager; import android.app.Service; import android.content.Context; @@ -188,71 +188,73 @@ public class XmppConnectionService extends Service { @Override public void onPresencePacketReceived(Account account, PresencePacket packet) { - String[] fromParts = packet.getAttribute("from").split("/"); - Contact contact = findContact(account, fromParts[0]); - if (contact == null) { - // most likely muc, self or roster not synced - Log.d(LOGTAG, - "got presence for non contact " + packet.toString()); - return; - } - String type = packet.getAttribute("type"); - if (type == null) { - Element show = packet.findChild("show"); - if (show == null) { - contact.updatePresence(fromParts[1], Presences.ONLINE); - } else if (show.getContent().equals("away")) { - contact.updatePresence(fromParts[1], Presences.AWAY); - } else if (show.getContent().equals("xa")) { - contact.updatePresence(fromParts[1], Presences.XA); - } else if (show.getContent().equals("chat")) { - contact.updatePresence(fromParts[1], Presences.CHAT); - } else if (show.getContent().equals("dnd")) { - contact.updatePresence(fromParts[1], Presences.DND); + if (packet.hasChild("x")&&(packet.findChild("x").getAttribute("xmlns").startsWith("http://jabber.org/protocol/muc"))) { + Log.d(LOGTAG,"got muc presence "+packet.toString()); + } else { + String[] fromParts = packet.getAttribute("from").split("/"); + Contact contact = findContact(account, fromParts[0]); + if (contact == null) { + // most likely self or roster not synced + return; } - PgpEngine pgp = getPgpEngine(); - if (pgp!=null) { - Element x = packet.findChild("x"); - if ((x != null) - && (x.getAttribute("xmlns").equals("jabber:x:signed"))) { - try { - Log.d(LOGTAG,"pgp signature for contact" +packet.getAttribute("from")); - contact.setPgpKeyId(pgp.fetchKeyId(packet.findChild("status") - .getContent(), x.getContent())); - } catch (OpenPgpException e) { - Log.d(LOGTAG,"faulty pgp. just ignore"); + String type = packet.getAttribute("type"); + if (type == null) { + Element show = packet.findChild("show"); + if (show == null) { + contact.updatePresence(fromParts[1], Presences.ONLINE); + } else if (show.getContent().equals("away")) { + contact.updatePresence(fromParts[1], Presences.AWAY); + } else if (show.getContent().equals("xa")) { + contact.updatePresence(fromParts[1], Presences.XA); + } else if (show.getContent().equals("chat")) { + contact.updatePresence(fromParts[1], Presences.CHAT); + } else if (show.getContent().equals("dnd")) { + contact.updatePresence(fromParts[1], Presences.DND); + } + PgpEngine pgp = getPgpEngine(); + if (pgp!=null) { + Element x = packet.findChild("x"); + if ((x != null) + && (x.getAttribute("xmlns").equals("jabber:x:signed"))) { + try { + Log.d(LOGTAG,"pgp signature for contact" +packet.getAttribute("from")); + contact.setPgpKeyId(pgp.fetchKeyId(packet.findChild("status") + .getContent(), x.getContent())); + } catch (OpenPgpException e) { + Log.d(LOGTAG,"faulty pgp. just ignore"); + } } } - } - databaseBackend.updateContact(contact); - } else if (type.equals("unavailable")) { - if (fromParts.length != 2) { - // Log.d(LOGTAG,"received presence with no resource "+packet.toString()); - } else { - contact.removePresence(fromParts[1]); databaseBackend.updateContact(contact); - } - } else if (type.equals("subscribe")) { - if (contact - .getSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT)) { - sendPresenceUpdatesTo(contact); - contact.setSubscriptionOption(Contact.Subscription.FROM); - contact.resetSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT); - replaceContactInConversation(contact.getJid(), contact); - databaseBackend.updateContact(contact); - if ((contact - .getSubscriptionOption(Contact.Subscription.ASKING)) - && (!contact - .getSubscriptionOption(Contact.Subscription.TO))) { - requestPresenceUpdatesFrom(contact); + } else if (type.equals("unavailable")) { + if (fromParts.length != 2) { + // Log.d(LOGTAG,"received presence with no resource "+packet.toString()); + } else { + contact.removePresence(fromParts[1]); + databaseBackend.updateContact(contact); + } + } else if (type.equals("subscribe")) { + if (contact + .getSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT)) { + sendPresenceUpdatesTo(contact); + contact.setSubscriptionOption(Contact.Subscription.FROM); + contact.resetSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT); + replaceContactInConversation(contact.getJid(), contact); + databaseBackend.updateContact(contact); + if ((contact + .getSubscriptionOption(Contact.Subscription.ASKING)) + && (!contact + .getSubscriptionOption(Contact.Subscription.TO))) { + requestPresenceUpdatesFrom(contact); + } + } else { + // TODO: ask user to handle it maybe } } else { - // TODO: ask user to handle it maybe + //Log.d(LOGTAG, packet.toString()); } - } else { - Log.d(LOGTAG, packet.toString()); + replaceContactInConversation(contact.getJid(), contact); } - replaceContactInConversation(contact.getJid(), contact); } }; diff --git a/src/de/gultsch/chat/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java similarity index 93% rename from src/de/gultsch/chat/ui/ConversationActivity.java rename to src/eu/siacs/conversations/ui/ConversationActivity.java index 88d30bc524d9200eec60f40b5db0f1cded65dd24..7660b8fd9af5aba87d33adccd6e64d7a48be5532 100644 --- a/src/de/gultsch/chat/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -1,22 +1,16 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.openintents.openpgp.OpenPgpSignatureResult; -import org.openintents.openpgp.util.OpenPgpConstants; - -import de.gultsch.chat.R; -import de.gultsch.chat.R.id; -import de.gultsch.chat.crypto.PgpEngine; -import de.gultsch.chat.crypto.PgpEngine.UserInputRequiredException; -import de.gultsch.chat.entities.Account; -import de.gultsch.chat.entities.Contact; -import de.gultsch.chat.entities.Conversation; -import de.gultsch.chat.entities.Message; -import de.gultsch.chat.utils.UIHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.utils.UIHelper; import android.net.Uri; import android.os.Bundle; import android.app.AlertDialog; @@ -25,7 +19,6 @@ import android.app.NotificationManager; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.IntentSender.SendIntentException; import android.graphics.Typeface; import android.support.v4.widget.SlidingPaneLayout; import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener; @@ -67,7 +60,6 @@ public class ConversationActivity extends XmppActivity { @Override public void onConversationListChanged() { - final Conversation currentConv = getSelectedConversation(); conversationList.clear(); conversationList.addAll(xmppConnectionService .getConversations()); @@ -104,8 +96,6 @@ public class ConversationActivity extends XmppActivity { xmppConnectionService.createContact(contact); } }; - private boolean contactInserted = false; - public List getConversationList() { return this.conversationList; @@ -206,7 +196,7 @@ public class ConversationActivity extends XmppActivity { } } }); - spl = (SlidingPaneLayout) findViewById(id.slidingpanelayout); + spl = (SlidingPaneLayout) findViewById(R.id.slidingpanelayout); spl.setParallaxDistance(150); spl.setShadowResource(R.drawable.es_slidingpane_shadow); spl.setSliderFadeColor(0); @@ -257,19 +247,26 @@ public class ConversationActivity extends XmppActivity { public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.conversations, menu); MenuItem menuSecure = (MenuItem) menu.findItem(R.id.action_security); + MenuItem menuArchive = (MenuItem) menu.findItem(R.id.action_archive); + MenuItem menuMucDetails = (MenuItem) menu.findItem(R.id.action_muc_details); + MenuItem menuContactDetails = (MenuItem) menu.findItem(R.id.action_contact_details); if (spl.isOpen()) { - ((MenuItem) menu.findItem(R.id.action_archive)).setVisible(false); - ((MenuItem) menu.findItem(R.id.action_details)).setVisible(false); + menuArchive.setVisible(false); + menuMucDetails.setVisible(false); + menuContactDetails.setVisible(false); menuSecure.setVisible(false); } else { ((MenuItem) menu.findItem(R.id.action_add)).setVisible(false); if (this.getSelectedConversation()!=null) { if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) { - ((MenuItem) menu.findItem(R.id.action_security)).setVisible(false); + menuMucDetails.setVisible(true); + menuContactDetails.setVisible(false); menuSecure.setVisible(false); - ((MenuItem) menu.findItem(R.id.action_archive)).setTitle("Leave conference"); + menuArchive.setTitle("Leave conference"); } else { + menuContactDetails.setVisible(true); + menuMucDetails.setVisible(false); if (this.getSelectedConversation().getLatestMessage().getEncryption() != Message.ENCRYPTION_NONE) { menuSecure.setIcon(R.drawable.ic_action_secure); } @@ -302,7 +299,7 @@ public class ConversationActivity extends XmppActivity { xmppConnectionService.archiveConversation(conv); selectedConversation = conversationList.get(0); break; - case R.id.action_details: + case R.id.action_contact_details: DialogContactDetails details = new DialogContactDetails(); Contact contact = this.getSelectedConversation().getContact(); if (contact != null) { diff --git a/src/de/gultsch/chat/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java similarity index 97% rename from src/de/gultsch/chat/ui/ConversationFragment.java rename to src/eu/siacs/conversations/ui/ConversationFragment.java index af07fdbb8496199e60fe04baf2fe07ef1ed88b9d..ff06fafcce572cadfabf420e9c620baf69d6d9e9 100644 --- a/src/de/gultsch/chat/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; import java.io.FileNotFoundException; import java.util.ArrayList; @@ -10,15 +10,15 @@ import java.util.Set; import net.java.otr4j.session.SessionStatus; -import de.gultsch.chat.R; -import de.gultsch.chat.crypto.PgpEngine.OpenPgpException; -import de.gultsch.chat.crypto.PgpEngine.UserInputRequiredException; -import de.gultsch.chat.entities.Contact; -import de.gultsch.chat.entities.Conversation; -import de.gultsch.chat.entities.Message; -import de.gultsch.chat.services.XmppConnectionService; -import de.gultsch.chat.utils.PhoneHelper; -import de.gultsch.chat.utils.UIHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.PgpEngine.OpenPgpException; +import eu.siacs.conversations.crypto.PgpEngine.UserInputRequiredException; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.PhoneHelper; +import eu.siacs.conversations.utils.UIHelper; import android.app.AlertDialog; import android.app.Fragment; import android.content.DialogInterface; diff --git a/src/de/gultsch/chat/ui/DialogContactDetails.java b/src/eu/siacs/conversations/ui/DialogContactDetails.java similarity index 97% rename from src/de/gultsch/chat/ui/DialogContactDetails.java rename to src/eu/siacs/conversations/ui/DialogContactDetails.java index 324a7aacdb069c65395f94a1ca000bd03250cd23..1210bc3cb6c3b9cad21662cba364328e894e34c2 100644 --- a/src/de/gultsch/chat/ui/DialogContactDetails.java +++ b/src/eu/siacs/conversations/ui/DialogContactDetails.java @@ -1,9 +1,9 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; -import de.gultsch.chat.R; -import de.gultsch.chat.entities.Contact; -import de.gultsch.chat.entities.Presences; -import de.gultsch.chat.utils.UIHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Presences; +import eu.siacs.conversations.utils.UIHelper; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; @@ -13,7 +13,6 @@ import android.os.Bundle; import android.provider.ContactsContract.CommonDataKinds; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Intents; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/de/gultsch/chat/ui/EditAccount.java b/src/eu/siacs/conversations/ui/EditAccount.java similarity index 93% rename from src/de/gultsch/chat/ui/EditAccount.java rename to src/eu/siacs/conversations/ui/EditAccount.java index 88aa76f5534a12960150999e5439b7113182bf4a..3ec74174274fbeeb78b91784c166eccf672cee1c 100644 --- a/src/de/gultsch/chat/ui/EditAccount.java +++ b/src/eu/siacs/conversations/ui/EditAccount.java @@ -1,13 +1,11 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; -import de.gultsch.chat.R; -import de.gultsch.chat.entities.Account; -import de.gultsch.chat.utils.Validator; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.utils.Validator; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -16,7 +14,6 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; -import android.widget.RelativeLayout; import android.widget.TextView; public class EditAccount extends DialogFragment { diff --git a/src/de/gultsch/chat/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java similarity index 96% rename from src/de/gultsch/chat/ui/ManageAccountActivity.java rename to src/eu/siacs/conversations/ui/ManageAccountActivity.java index bcc5306d86b02fe352cb09fff6d72c910fe357c1..22b82e77f5753315821edcdb9ec57af1911284aa 100644 --- a/src/de/gultsch/chat/ui/ManageAccountActivity.java +++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -1,13 +1,13 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; import java.util.ArrayList; import java.util.List; -import de.gultsch.chat.R; -import de.gultsch.chat.crypto.PgpEngine; -import de.gultsch.chat.crypto.PgpEngine.UserInputRequiredException; -import de.gultsch.chat.entities.Account; -import de.gultsch.chat.ui.EditAccount.EditAccountListener; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.PgpEngine; +import eu.siacs.conversations.crypto.PgpEngine.UserInputRequiredException; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.ui.EditAccount.EditAccountListener; import android.app.Activity; import android.app.AlertDialog; import android.content.Context; diff --git a/src/de/gultsch/chat/ui/NewConversationActivity.java b/src/eu/siacs/conversations/ui/NewConversationActivity.java similarity index 95% rename from src/de/gultsch/chat/ui/NewConversationActivity.java rename to src/eu/siacs/conversations/ui/NewConversationActivity.java index ac178fad7df75911c04a9434e5ff471c7e81c549..628a304795ab9f0341230f88cb2d32ce3b5299cd 100644 --- a/src/de/gultsch/chat/ui/NewConversationActivity.java +++ b/src/eu/siacs/conversations/ui/NewConversationActivity.java @@ -1,22 +1,20 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import de.gultsch.chat.R; -import de.gultsch.chat.entities.Account; -import de.gultsch.chat.entities.Contact; -import de.gultsch.chat.entities.Conversation; -import de.gultsch.chat.utils.UIHelper; -import de.gultsch.chat.utils.Validator; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.utils.Validator; import android.net.Uri; import android.os.Bundle; -import android.provider.ContactsContract; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -35,13 +33,9 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.content.Context; -import android.content.CursorLoader; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; -import android.content.Loader; -import android.content.Loader.OnLoadCompleteListener; -import android.database.Cursor; public class NewConversationActivity extends XmppActivity { diff --git a/src/de/gultsch/chat/ui/OnAccountListChangedListener.java b/src/eu/siacs/conversations/ui/OnAccountListChangedListener.java similarity index 73% rename from src/de/gultsch/chat/ui/OnAccountListChangedListener.java rename to src/eu/siacs/conversations/ui/OnAccountListChangedListener.java index 4af5ac9bc83890a3ab6066d3fd704068b406410d..98ef445ec742fd9ec6026e97fa8f9e185e8a17c8 100644 --- a/src/de/gultsch/chat/ui/OnAccountListChangedListener.java +++ b/src/eu/siacs/conversations/ui/OnAccountListChangedListener.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; public interface OnAccountListChangedListener { public void onAccountListChangedListener(); diff --git a/src/de/gultsch/chat/ui/OnConversationListChangedListener.java b/src/eu/siacs/conversations/ui/OnConversationListChangedListener.java similarity index 73% rename from src/de/gultsch/chat/ui/OnConversationListChangedListener.java rename to src/eu/siacs/conversations/ui/OnConversationListChangedListener.java index 08b2bfb138e2f825d9acfd8b07d8280a7aa14b80..2a922e2186bf48267b9e8e6b7920672dfe5fc54b 100644 --- a/src/de/gultsch/chat/ui/OnConversationListChangedListener.java +++ b/src/eu/siacs/conversations/ui/OnConversationListChangedListener.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; public interface OnConversationListChangedListener { public void onConversationListChanged(); diff --git a/src/de/gultsch/chat/ui/OnRosterFetchedListener.java b/src/eu/siacs/conversations/ui/OnRosterFetchedListener.java similarity index 59% rename from src/de/gultsch/chat/ui/OnRosterFetchedListener.java rename to src/eu/siacs/conversations/ui/OnRosterFetchedListener.java index ad3f6592b50ff3f0852b431bc0d73e5199a79e34..d69ce35b7a51284cc21370841264009c95bf9891 100644 --- a/src/de/gultsch/chat/ui/OnRosterFetchedListener.java +++ b/src/eu/siacs/conversations/ui/OnRosterFetchedListener.java @@ -1,7 +1,8 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; import java.util.List; -import de.gultsch.chat.entities.Contact; + +import eu.siacs.conversations.entities.Contact; public interface OnRosterFetchedListener { public void onRosterFetched(List roster); diff --git a/src/de/gultsch/chat/ui/SettingsActivity.java b/src/eu/siacs/conversations/ui/SettingsActivity.java similarity index 91% rename from src/de/gultsch/chat/ui/SettingsActivity.java rename to src/eu/siacs/conversations/ui/SettingsActivity.java index 886c05cca2d86aafacc192d9d8c0472d9a5b08aa..abaf8c6876553fd8da36e65484e74c8d138f62b7 100644 --- a/src/de/gultsch/chat/ui/SettingsActivity.java +++ b/src/eu/siacs/conversations/ui/SettingsActivity.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; import android.app.Activity; import android.os.Bundle; diff --git a/src/de/gultsch/chat/ui/SettingsFragment.java b/src/eu/siacs/conversations/ui/SettingsFragment.java similarity index 83% rename from src/de/gultsch/chat/ui/SettingsFragment.java rename to src/eu/siacs/conversations/ui/SettingsFragment.java index 3ca4841afd3430fb3ed59663408228b81fcff1b0..7e1c36989492fed38e85b0e71fdfddf7f4ded511 100644 --- a/src/de/gultsch/chat/ui/SettingsFragment.java +++ b/src/eu/siacs/conversations/ui/SettingsFragment.java @@ -1,6 +1,6 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; -import de.gultsch.chat.R; +import eu.siacs.conversations.R; import android.os.Bundle; import android.preference.PreferenceFragment; diff --git a/src/de/gultsch/chat/ui/XmppActivity.java b/src/eu/siacs/conversations/ui/XmppActivity.java similarity index 88% rename from src/de/gultsch/chat/ui/XmppActivity.java rename to src/eu/siacs/conversations/ui/XmppActivity.java index 66c92b72eb85d16f4ba28572975e1f52d63894d5..5114e640cbf05d988adf1b0eb5fe73e602a73708 100644 --- a/src/de/gultsch/chat/ui/XmppActivity.java +++ b/src/eu/siacs/conversations/ui/XmppActivity.java @@ -1,7 +1,7 @@ -package de.gultsch.chat.ui; +package eu.siacs.conversations.ui; -import de.gultsch.chat.services.XmppConnectionService; -import de.gultsch.chat.services.XmppConnectionService.XmppConnectionBinder; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder; import android.app.Activity; import android.content.ComponentName; import android.content.Context; diff --git a/src/de/gultsch/chat/utils/DNSHelper.java b/src/eu/siacs/conversations/utils/DNSHelper.java similarity index 98% rename from src/de/gultsch/chat/utils/DNSHelper.java rename to src/eu/siacs/conversations/utils/DNSHelper.java index f19b1b6f070180e2373cc79d2af9b73044541cdb..46fd692866c2da0471c5c34439ce7d136ac1ade7 100644 --- a/src/de/gultsch/chat/utils/DNSHelper.java +++ b/src/eu/siacs/conversations/utils/DNSHelper.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.utils; +package eu.siacs.conversations.utils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/de/gultsch/chat/utils/MessageParser.java b/src/eu/siacs/conversations/utils/MessageParser.java similarity index 94% rename from src/de/gultsch/chat/utils/MessageParser.java rename to src/eu/siacs/conversations/utils/MessageParser.java index a12ef58c994ce321cb8681dd004937925556013d..dc0cd35cff23fe51c1068a84ab42312dd5564eff 100644 --- a/src/de/gultsch/chat/utils/MessageParser.java +++ b/src/eu/siacs/conversations/utils/MessageParser.java @@ -1,16 +1,16 @@ -package de.gultsch.chat.utils; +package eu.siacs.conversations.utils; import java.util.List; import net.java.otr4j.session.Session; import net.java.otr4j.session.SessionStatus; import android.util.Log; -import de.gultsch.chat.entities.Account; -import de.gultsch.chat.entities.Conversation; -import de.gultsch.chat.entities.Message; -import de.gultsch.chat.services.XmppConnectionService; -import de.gultsch.chat.xml.Element; -import de.gultsch.chat.xmpp.MessagePacket; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.MessagePacket; public class MessageParser { diff --git a/src/de/gultsch/chat/utils/OnPhoneContactsLoadedListener.java b/src/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java similarity index 82% rename from src/de/gultsch/chat/utils/OnPhoneContactsLoadedListener.java rename to src/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java index c4df4ac307df26022b8efbf2840b082e445a6462..fa8cea04ce62c6918e2e91a7d6d335a84ea27825 100644 --- a/src/de/gultsch/chat/utils/OnPhoneContactsLoadedListener.java +++ b/src/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.utils; +package eu.siacs.conversations.utils; import java.util.Hashtable; diff --git a/src/de/gultsch/chat/utils/PhoneHelper.java b/src/eu/siacs/conversations/utils/PhoneHelper.java similarity index 98% rename from src/de/gultsch/chat/utils/PhoneHelper.java rename to src/eu/siacs/conversations/utils/PhoneHelper.java index 14773caa48e007fcca745285cf4a4fd5e71ea472..e28f817e79d2adedb9d96aebda2a33c30e1e08c5 100644 --- a/src/de/gultsch/chat/utils/PhoneHelper.java +++ b/src/eu/siacs/conversations/utils/PhoneHelper.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.utils; +package eu.siacs.conversations.utils; import java.util.Hashtable; diff --git a/src/de/gultsch/chat/utils/SASL.java b/src/eu/siacs/conversations/utils/SASL.java similarity index 94% rename from src/de/gultsch/chat/utils/SASL.java rename to src/eu/siacs/conversations/utils/SASL.java index 266f0cb29b4592c309e0370b233e04ba965fd352..cda1f97beaa9ebad36332099c9e4305b0092ec38 100644 --- a/src/de/gultsch/chat/utils/SASL.java +++ b/src/eu/siacs/conversations/utils/SASL.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.utils; +package eu.siacs.conversations.utils; import android.util.Base64; diff --git a/src/de/gultsch/chat/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java similarity index 95% rename from src/de/gultsch/chat/utils/UIHelper.java rename to src/eu/siacs/conversations/utils/UIHelper.java index 5e81f09903f3a922b6a2aa401ed748191efa9ec2..f79fe14cf28eec290c8fbe7a5c02f1d7b0c4d4da 100644 --- a/src/de/gultsch/chat/utils/UIHelper.java +++ b/src/eu/siacs/conversations/utils/UIHelper.java @@ -1,17 +1,15 @@ -package de.gultsch.chat.utils; +package eu.siacs.conversations.utils; -import java.io.FileDescriptor; -import java.io.FileNotFoundException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import de.gultsch.chat.R; -import de.gultsch.chat.entities.Account; -import de.gultsch.chat.entities.Contact; -import de.gultsch.chat.entities.Conversation; -import de.gultsch.chat.entities.Message; -import de.gultsch.chat.ui.ConversationActivity; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.ui.ConversationActivity; import android.app.Activity; import android.app.AlertDialog; @@ -32,7 +30,6 @@ import android.preference.PreferenceManager; import android.provider.ContactsContract.Contacts; import android.support.v4.app.NotificationCompat; import android.support.v4.app.TaskStackBuilder; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; diff --git a/src/de/gultsch/chat/utils/Validator.java b/src/eu/siacs/conversations/utils/Validator.java similarity index 90% rename from src/de/gultsch/chat/utils/Validator.java rename to src/eu/siacs/conversations/utils/Validator.java index a29ffa0ae156fcade4c570ad48593958a4794a9e..fce953aef959016e8b568aec61010b51652e00cb 100644 --- a/src/de/gultsch/chat/utils/Validator.java +++ b/src/eu/siacs/conversations/utils/Validator.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.utils; +package eu.siacs.conversations.utils; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/de/gultsch/chat/xml/Element.java b/src/eu/siacs/conversations/xml/Element.java similarity index 98% rename from src/de/gultsch/chat/xml/Element.java rename to src/eu/siacs/conversations/xml/Element.java index 01deb1d2054c4f3686962a2138ff7f2b1c316393..ad95ef9cef10c2abf7b3457d6387b7cf6c25a23d 100644 --- a/src/de/gultsch/chat/xml/Element.java +++ b/src/eu/siacs/conversations/xml/Element.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.xml; +package eu.siacs.conversations.xml; import java.util.ArrayList; import java.util.Hashtable; diff --git a/src/de/gultsch/chat/xml/Tag.java b/src/eu/siacs/conversations/xml/Tag.java similarity index 98% rename from src/de/gultsch/chat/xml/Tag.java rename to src/eu/siacs/conversations/xml/Tag.java index 275229cf4c35ab47de79e38455e4815962daac2f..970cf0aedf21a3feba645b70735e9cb04bd46713 100644 --- a/src/de/gultsch/chat/xml/Tag.java +++ b/src/eu/siacs/conversations/xml/Tag.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.xml; +package eu.siacs.conversations.xml; import java.util.Hashtable; import java.util.Iterator; diff --git a/src/de/gultsch/chat/xml/TagWriter.java b/src/eu/siacs/conversations/xml/TagWriter.java similarity index 97% rename from src/de/gultsch/chat/xml/TagWriter.java rename to src/eu/siacs/conversations/xml/TagWriter.java index 844f5253e7d956728a6a39d93174b4d0d5af24d6..109078ca1a78c9a36de288bfc36adf5590a3ad77 100644 --- a/src/de/gultsch/chat/xml/TagWriter.java +++ b/src/eu/siacs/conversations/xml/TagWriter.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.xml; +package eu.siacs.conversations.xml; import java.io.IOException; import java.io.OutputStream; diff --git a/src/de/gultsch/chat/xml/XmlReader.java b/src/eu/siacs/conversations/xml/XmlReader.java similarity index 98% rename from src/de/gultsch/chat/xml/XmlReader.java rename to src/eu/siacs/conversations/xml/XmlReader.java index 0ff2e78586c851f56341357560002f4f7b955d3c..131141ddd08ced5dbdd54f42a4fdc2c399838ec6 100644 --- a/src/de/gultsch/chat/xml/XmlReader.java +++ b/src/eu/siacs/conversations/xml/XmlReader.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.xml; +package eu.siacs.conversations.xml; import java.io.IOException; import java.io.InputStream; diff --git a/src/de/gultsch/chat/xmpp/IqPacket.java b/src/eu/siacs/conversations/xmpp/IqPacket.java similarity index 88% rename from src/de/gultsch/chat/xmpp/IqPacket.java rename to src/eu/siacs/conversations/xmpp/IqPacket.java index d7672540d670061a3e882cbaad7ce3df860f84b2..2319fd28bc914a8218567714e84610babf3eaeef 100644 --- a/src/de/gultsch/chat/xmpp/IqPacket.java +++ b/src/eu/siacs/conversations/xmpp/IqPacket.java @@ -1,6 +1,6 @@ -package de.gultsch.chat.xmpp; +package eu.siacs.conversations.xmpp; -import de.gultsch.chat.xml.Element; +import eu.siacs.conversations.xml.Element; public class IqPacket extends Element { diff --git a/src/de/gultsch/chat/xmpp/MessagePacket.java b/src/eu/siacs/conversations/xmpp/MessagePacket.java similarity index 95% rename from src/de/gultsch/chat/xmpp/MessagePacket.java rename to src/eu/siacs/conversations/xmpp/MessagePacket.java index 160a8c0ad73fbbe44f128b8225c0c39cb07cc6b7..a014155fc55c71030a093114d3d06c96f91b1088 100644 --- a/src/de/gultsch/chat/xmpp/MessagePacket.java +++ b/src/eu/siacs/conversations/xmpp/MessagePacket.java @@ -1,6 +1,6 @@ -package de.gultsch.chat.xmpp; +package eu.siacs.conversations.xmpp; -import de.gultsch.chat.xml.Element; +import eu.siacs.conversations.xml.Element; public class MessagePacket extends Element { public static final int TYPE_CHAT = 0; diff --git a/src/de/gultsch/chat/xmpp/OnIqPacketReceived.java b/src/eu/siacs/conversations/xmpp/OnIqPacketReceived.java similarity index 56% rename from src/de/gultsch/chat/xmpp/OnIqPacketReceived.java rename to src/eu/siacs/conversations/xmpp/OnIqPacketReceived.java index 0a2e0361dad7fcc94b21eb50ff7711791a44c0c2..4e09282c338a05e8913b8f532812a3fd8dbda9dd 100644 --- a/src/de/gultsch/chat/xmpp/OnIqPacketReceived.java +++ b/src/eu/siacs/conversations/xmpp/OnIqPacketReceived.java @@ -1,6 +1,6 @@ -package de.gultsch.chat.xmpp; +package eu.siacs.conversations.xmpp; -import de.gultsch.chat.entities.Account; +import eu.siacs.conversations.entities.Account; public interface OnIqPacketReceived { public void onIqPacketReceived(Account account, IqPacket packet); diff --git a/src/de/gultsch/chat/xmpp/OnMessagePacketReceived.java b/src/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java similarity index 59% rename from src/de/gultsch/chat/xmpp/OnMessagePacketReceived.java rename to src/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java index 30f6c29bdf054b867174eeca53b70fa43cdd5c82..3d169300d461a11e7f7affcb6d498ea29ea90bff 100644 --- a/src/de/gultsch/chat/xmpp/OnMessagePacketReceived.java +++ b/src/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java @@ -1,6 +1,6 @@ -package de.gultsch.chat.xmpp; +package eu.siacs.conversations.xmpp; -import de.gultsch.chat.entities.Account; +import eu.siacs.conversations.entities.Account; public interface OnMessagePacketReceived { public void onMessagePacketReceived(Account account, MessagePacket packet); diff --git a/src/de/gultsch/chat/xmpp/OnPresencePacketReceived.java b/src/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java similarity index 59% rename from src/de/gultsch/chat/xmpp/OnPresencePacketReceived.java rename to src/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java index 4c9767791ee3eccc0fb5c263942b9698af4a86ca..058d8be917f8fe694dfbe7db8064293a629aaa52 100644 --- a/src/de/gultsch/chat/xmpp/OnPresencePacketReceived.java +++ b/src/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java @@ -1,6 +1,6 @@ -package de.gultsch.chat.xmpp; +package eu.siacs.conversations.xmpp; -import de.gultsch.chat.entities.Account; +import eu.siacs.conversations.entities.Account; public interface OnPresencePacketReceived { public void onPresencePacketReceived(Account account, PresencePacket packet); diff --git a/src/de/gultsch/chat/xmpp/OnStatusChanged.java b/src/eu/siacs/conversations/xmpp/OnStatusChanged.java similarity index 50% rename from src/de/gultsch/chat/xmpp/OnStatusChanged.java rename to src/eu/siacs/conversations/xmpp/OnStatusChanged.java index f79305e351df044dfcebe529c6f8acbc88aa62d4..ad1d98cb92c84f66fc909e2d901911ca125220b0 100644 --- a/src/de/gultsch/chat/xmpp/OnStatusChanged.java +++ b/src/eu/siacs/conversations/xmpp/OnStatusChanged.java @@ -1,6 +1,6 @@ -package de.gultsch.chat.xmpp; +package eu.siacs.conversations.xmpp; -import de.gultsch.chat.entities.Account; +import eu.siacs.conversations.entities.Account; public interface OnStatusChanged { public void onStatusChanged(Account account); diff --git a/src/de/gultsch/chat/xmpp/PresencePacket.java b/src/eu/siacs/conversations/xmpp/PresencePacket.java similarity index 67% rename from src/de/gultsch/chat/xmpp/PresencePacket.java rename to src/eu/siacs/conversations/xmpp/PresencePacket.java index 947afe7af339729cec0cd60dc539c9ee12a6e97d..3d77ce151189103dd54e6a8957c6eb554cada98e 100644 --- a/src/de/gultsch/chat/xmpp/PresencePacket.java +++ b/src/eu/siacs/conversations/xmpp/PresencePacket.java @@ -1,6 +1,6 @@ -package de.gultsch.chat.xmpp; +package eu.siacs.conversations.xmpp; -import de.gultsch.chat.xml.Element; +import eu.siacs.conversations.xml.Element; public class PresencePacket extends Element { private PresencePacket(String name) { diff --git a/src/de/gultsch/chat/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java similarity index 97% rename from src/de/gultsch/chat/xmpp/XmppConnection.java rename to src/eu/siacs/conversations/xmpp/XmppConnection.java index 1b9aa0c3a935d0819eace382f09fa8be184fcc10..4583c145ba3b0f7f632dabef3b51a0c652c1744a 100644 --- a/src/de/gultsch/chat/xmpp/XmppConnection.java +++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java @@ -1,4 +1,4 @@ -package de.gultsch.chat.xmpp; +package eu.siacs.conversations.xmpp; import java.io.IOException; import java.io.InputStream; @@ -19,13 +19,13 @@ import org.xmlpull.v1.XmlPullParserException; import android.os.Bundle; import android.os.PowerManager; import android.util.Log; -import de.gultsch.chat.entities.Account; -import de.gultsch.chat.utils.DNSHelper; -import de.gultsch.chat.utils.SASL; -import de.gultsch.chat.xml.Element; -import de.gultsch.chat.xml.Tag; -import de.gultsch.chat.xml.XmlReader; -import de.gultsch.chat.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.utils.DNSHelper; +import eu.siacs.conversations.utils.SASL; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xml.Tag; +import eu.siacs.conversations.xml.TagWriter; +import eu.siacs.conversations.xml.XmlReader; public class XmppConnection implements Runnable {