diff options
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/AboutActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/AboutActivity.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/AboutPreference.java (renamed from src/main/java/eu/siacs/conversations/ui/AboutPreference.java) | 7 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/AbstractSearchableListItemActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/BlockContactDialog.java (renamed from src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/BlocklistActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ChangePasswordActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java) | 13 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ChooseContactActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java) | 29 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java) | 28 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ConversationActivity.java) | 38 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java (renamed from src/main/java/eu/siacs/conversations/ui/ConversationFragment.java) | 46 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java) | 22 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/EditMessage.java (renamed from src/main/java/eu/siacs/conversations/ui/EditMessage.java) | 5 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ManageAccountActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/SettingsActivity.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/SettingsFragment.java (renamed from src/main/java/eu/siacs/conversations/ui/SettingsFragment.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java) | 36 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/TimePreference.java (renamed from src/main/java/eu/siacs/conversations/ui/TimePreference.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/UiCallback.java (renamed from src/main/java/eu/siacs/conversations/ui/UiCallback.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/XmppActivity.java) | 34 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java) | 35 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/KnownHostsAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java) | 12 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java) | 27 |
28 files changed, 222 insertions, 240 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/AboutActivity.java index a61b872a..fd8a187a 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/AboutActivity.java @@ -1,9 +1,9 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.Activity; import android.os.Bundle; -import eu.siacs.conversations.R; +import de.thedevstack.conversationsplus.R; public class AboutActivity extends Activity { diff --git a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java b/src/main/java/de/thedevstack/conversationsplus/ui/AboutPreference.java index a57e1b89..c1fd4d67 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/AboutPreference.java @@ -1,12 +1,11 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; import android.preference.Preference; import android.util.AttributeSet; -import eu.siacs.conversations.utils.PhoneHelper; +import de.thedevstack.conversationsplus.utils.PhoneHelper; public class AboutPreference extends Preference { public AboutPreference(final Context context, final AttributeSet attrs, final int defStyle) { @@ -27,7 +26,7 @@ public class AboutPreference extends Preference { } private void setSummary() { - setSummary("Conversations " + PhoneHelper.getVersionName(getContext())); + setSummary("Conversations+ " + PhoneHelper.getVersionName(getContext())); } } diff --git a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/AbstractSearchableListItemActivity.java index 1a9fc95c..b8e57f47 100644 --- a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/AbstractSearchableListItemActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.content.Context; import android.os.Bundle; @@ -15,9 +15,9 @@ import android.widget.ListView; import java.util.ArrayList; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.ui.adapter.ListItemAdapter; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.ListItem; +import de.thedevstack.conversationsplus.ui.adapter.ListItemAdapter; public abstract class AbstractSearchableListItemActivity extends XmppActivity { private ListView mListView; diff --git a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/BlockContactDialog.java index 9cf7e9f8..589f565c 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/BlockContactDialog.java @@ -1,12 +1,12 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Blockable; -import eu.siacs.conversations.services.XmppConnectionService; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Blockable; +import de.thedevstack.conversationsplus.services.XmppConnectionService; public final class BlockContactDialog { public static void show(final Context context, diff --git a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/BlocklistActivity.java index 13d7f4fc..4e6d7701 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/BlocklistActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.os.Bundle; import android.text.Editable; @@ -7,10 +7,10 @@ import android.widget.AdapterView; import java.util.Collections; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class BlocklistActivity extends AbstractSearchableListItemActivity implements OnUpdateBlocklist { diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ChangePasswordActivity.java index aac435fd..9d6b50fc 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ChangePasswordActivity.java @@ -1,17 +1,16 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.os.Bundle; import android.view.View; import android.widget.Button; import android.widget.EditText; -import android.widget.TextView; import android.widget.Toast; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class ChangePasswordActivity extends XmppActivity implements XmppConnectionService.OnAccountPasswordChanged { diff --git a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ChooseContactActivity.java index c9e99ce5..d51d23e1 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ChooseContactActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.content.Context; import android.content.Intent; @@ -19,10 +19,10 @@ import java.util.Collections; import java.util.List; import java.util.ArrayList; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.ListItem; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.ListItem; public class ChooseContactActivity extends AbstractSearchableListItemActivity { diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java index 07b8819d..de6436d9 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.annotation.TargetApi; import android.app.AlertDialog; @@ -27,20 +27,19 @@ import org.openintents.openpgp.util.OpenPgpUtils; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.List; - -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.PgpEngine; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Bookmark; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.MucOptions; -import eu.siacs.conversations.entities.MucOptions.User; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.services.XmppConnectionService.OnMucRosterUpdate; -import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdate; -import eu.siacs.conversations.xmpp.jid.Jid; + +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.crypto.PgpEngine; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Bookmark; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.MucOptions; +import de.thedevstack.conversationsplus.entities.MucOptions.User; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnMucRosterUpdate; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnConversationUpdate; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class ConferenceDetailsActivity extends XmppActivity implements OnConversationUpdate, OnMucRosterUpdate, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnRoleChanged, XmppConnectionService.OnConferenceOptionsPushed { public static final String ACTION_VIEW_MUC = "view_muc"; diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java index c190caed..c84f9b89 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.AlertDialog; import android.app.PendingIntent; @@ -32,19 +32,19 @@ import org.openintents.openpgp.util.OpenPgpUtils; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.PgpEngine; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; -import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.XmppConnection; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.crypto.PgpEngine; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.ListItem; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnAccountUpdate; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnRosterUpdate; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.xmpp.XmppConnection; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class ContactDetailsActivity extends XmppActivity implements OnAccountUpdate, OnRosterUpdate, OnUpdateBlocklist { public static final String ACTION_VIEW_CONTACT = "view_contact"; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java index 0504ff34..f5de4ae8 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.annotation.SuppressLint; import android.app.ActionBar; @@ -34,25 +34,25 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Blockable; -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.services.XmppConnectionService.OnAccountUpdate; -import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdate; -import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate; -import eu.siacs.conversations.ui.adapter.ConversationAdapter; -import eu.siacs.conversations.utils.ExceptionHelper; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Blockable; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnAccountUpdate; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnConversationUpdate; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnRosterUpdate; +import de.thedevstack.conversationsplus.ui.adapter.ConversationAdapter; +import de.thedevstack.conversationsplus.utils.ExceptionHelper; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; import github.ankushsachdeva.emojicon.EmojiconEditText; public class ConversationActivity extends XmppActivity implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast { - public static final String ACTION_DOWNLOAD = "eu.siacs.conversations.action.DOWNLOAD"; + public static final String ACTION_DOWNLOAD = "de.thedevstack.conversationsplus.action.DOWNLOAD"; public static final String VIEW_CONVERSATION = "viewConversation"; public static final String CONVERSATION = "conversationUuid"; @@ -433,11 +433,11 @@ public class ConversationActivity extends XmppActivity break; case ATTACHMENT_CHOICE_RECORD_VOICE: intent.setAction(MediaStore.Audio.Media.RECORD_SOUND_ACTION); - fallbackPackageId = "eu.siacs.conversations.voicerecorder"; + fallbackPackageId = "de.thedevstack.conversationsplus.voicerecorder"; break; case ATTACHMENT_CHOICE_LOCATION: - intent.setAction("eu.siacs.conversations.location.request"); - fallbackPackageId = "eu.siacs.conversations.sharelocation"; + intent.setAction("de.thedevstack.conversationsplus.location.request"); + fallbackPackageId = "de.thedevstack.conversationsplus.sharelocation"; break; } if (intent.resolveActivity(getPackageManager()) != null) { @@ -651,7 +651,7 @@ public class ConversationActivity extends XmppActivity if (new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION).resolveActivity(getPackageManager()) == null) { attachFilePopup.getMenu().findItem(R.id.attach_record_voice).setVisible(false); } - if (new Intent("eu.siacs.conversations.location.request").resolveActivity(getPackageManager()) == null) { + if (new Intent("de.thedevstack.conversationsplus.location.request").resolveActivity(getPackageManager()) == null) { attachFilePopup.getMenu().findItem(R.id.attach_location).setVisible(false); } attachFilePopup.setOnMenuItemClickListener(new OnMenuItemClickListener() { diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java index 5a672520..a30b3483 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.AlertDialog; import android.app.Fragment; @@ -43,28 +43,28 @@ import java.util.NoSuchElementException; import java.util.concurrent.ConcurrentLinkedQueue; import de.tzur.conversations.Settings; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.PgpEngine; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.entities.TransferablePlaceholder; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.MucOptions; -import eu.siacs.conversations.entities.Presences; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.ui.XmppActivity.OnPresenceSelected; -import eu.siacs.conversations.ui.XmppActivity.OnValueEdited; -import eu.siacs.conversations.ui.adapter.MessageAdapter; -import eu.siacs.conversations.ui.adapter.MessageAdapter.OnContactPictureClicked; -import eu.siacs.conversations.ui.adapter.MessageAdapter.OnContactPictureLongClicked; -import eu.siacs.conversations.utils.GeoHelper; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.chatstate.ChatState; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.crypto.PgpEngine; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.entities.TransferablePlaceholder; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.MucOptions; +import de.thedevstack.conversationsplus.entities.Presences; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.ui.XmppActivity.OnPresenceSelected; +import de.thedevstack.conversationsplus.ui.XmppActivity.OnValueEdited; +import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter; +import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter.OnContactPictureClicked; +import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter.OnContactPictureLongClicked; +import de.thedevstack.conversationsplus.utils.GeoHelper; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; import github.ankushsachdeva.emojicon.EmojiconEditText; import github.ankushsachdeva.emojicon.EmojiconGridView; import github.ankushsachdeva.emojicon.EmojiconsPopup; diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java index 908c29d2..efcd4128 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.PendingIntent; import android.content.Intent; @@ -23,16 +23,16 @@ import android.widget.TableLayout; import android.widget.TextView; import android.widget.Toast; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; -import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.XmppConnection.Features; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnAccountUpdate; +import de.thedevstack.conversationsplus.ui.adapter.KnownHostsAdapter; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xmpp.XmppConnection.Features; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.pep.Avatar; public class EditAccountActivity extends XmppActivity implements OnAccountUpdate{ diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/de/thedevstack/conversationsplus/ui/EditMessage.java index a7aa2024..5c2e6164 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/EditMessage.java @@ -1,12 +1,11 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.content.Context; import android.os.Handler; import android.util.AttributeSet; import android.view.KeyEvent; -import android.widget.EditText; -import eu.siacs.conversations.Config; +import de.thedevstack.conversationsplus.Config; import github.ankushsachdeva.emojicon.EmojiconEditText; public class EditMessage extends EmojiconEditText { diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ManageAccountActivity.java index 56dbc55e..0820ec8b 100644 --- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ManageAccountActivity.java @@ -1,12 +1,12 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import java.util.ArrayList; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; -import eu.siacs.conversations.ui.adapter.AccountAdapter; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnAccountUpdate; +import de.thedevstack.conversationsplus.ui.adapter.AccountAdapter; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java index 4333dbdb..be08da14 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.PendingIntent; import android.content.Intent; @@ -13,12 +13,12 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.utils.PhoneHelper; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.utils.PhoneHelper; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.pep.Avatar; public class PublishProfilePictureActivity extends XmppActivity { diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java index f3d5d8bd..36e2cca0 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import java.security.KeyStoreException; import java.util.ArrayList; @@ -9,9 +9,9 @@ import java.util.Locale; import de.tzur.conversations.Settings; import de.duenndns.ssl.MemorizingTrustManager; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xmpp.XmppConnection; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.xmpp.XmppConnection; import android.app.AlertDialog; import android.app.Fragment; diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsFragment.java index e4185abc..a549ff94 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsFragment.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.Dialog; import android.os.Bundle; @@ -11,7 +11,7 @@ import android.view.ViewParent; import android.widget.FrameLayout; import android.widget.LinearLayout; -import eu.siacs.conversations.R; +import de.thedevstack.conversationsplus.R; public class SettingsFragment extends PreferenceFragment { diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java index 351f1dfc..55a19b42 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.PendingIntent; import android.content.Intent; @@ -17,14 +17,14 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.ui.adapter.ConversationAdapter; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.ui.adapter.ConversationAdapter; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class ShareWithActivity extends XmppActivity { diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java index 68e77af4..c5ac3985 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -52,23 +52,23 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Blockable; -import eu.siacs.conversations.entities.Bookmark; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.entities.Presences; -import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate; -import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; -import eu.siacs.conversations.ui.adapter.ListItemAdapter; -import eu.siacs.conversations.utils.XmppUri; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.XmppConnection; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Blockable; +import de.thedevstack.conversationsplus.entities.Bookmark; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.ListItem; +import de.thedevstack.conversationsplus.entities.Presences; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnRosterUpdate; +import de.thedevstack.conversationsplus.ui.adapter.KnownHostsAdapter; +import de.thedevstack.conversationsplus.ui.adapter.ListItemAdapter; +import de.thedevstack.conversationsplus.utils.XmppUri; +import de.thedevstack.conversationsplus.xmpp.XmppConnection; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class StartConversationActivity extends XmppActivity implements OnRosterUpdate, OnUpdateBlocklist { diff --git a/src/main/java/eu/siacs/conversations/ui/TimePreference.java b/src/main/java/de/thedevstack/conversationsplus/ui/TimePreference.java index e32b068c..bfe7c8f4 100644 --- a/src/main/java/eu/siacs/conversations/ui/TimePreference.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/TimePreference.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.content.Context; import android.content.res.TypedArray; diff --git a/src/main/java/eu/siacs/conversations/ui/UiCallback.java b/src/main/java/de/thedevstack/conversationsplus/ui/UiCallback.java index c80199e1..0d23d29e 100644 --- a/src/main/java/eu/siacs/conversations/ui/UiCallback.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/UiCallback.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.PendingIntent; diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java index ec9d59e1..9f867dd2 100644 --- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.ActionBar; import android.app.AlertDialog; @@ -19,15 +19,15 @@ import com.google.zxing.integration.android.IntentResult; import net.java.otr4j.OtrException; import net.java.otr4j.session.Session; -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.services.XmppConnectionService; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.XmppUri; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.utils.XmppUri; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class VerifyOTRActivity extends XmppActivity implements XmppConnectionService.OnConversationUpdate { diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java index 4157035b..8341e631 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -64,21 +64,21 @@ import java.util.List; import java.util.concurrent.RejectedExecutionException; import de.tzur.conversations.Settings; -import eu.siacs.conversations.Config; -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.entities.MucOptions; -import eu.siacs.conversations.entities.Presences; -import eu.siacs.conversations.services.AvatarService; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder; -import eu.siacs.conversations.utils.ExceptionHelper; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.MucOptions; +import de.thedevstack.conversationsplus.entities.Presences; +import de.thedevstack.conversationsplus.services.AvatarService; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.services.XmppConnectionService.XmppConnectionBinder; +import de.thedevstack.conversationsplus.utils.ExceptionHelper; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public abstract class XmppActivity extends Activity { @@ -759,7 +759,7 @@ public abstract class XmppActivity extends Activity { public NdefMessage createNdefMessage(NfcEvent nfcEvent) { return new NdefMessage(new NdefRecord[]{ NdefRecord.createUri(getShareableUri()), - NdefRecord.createApplicationRecord("eu.siacs.conversations") + NdefRecord.createApplicationRecord("de.thedevstack.conversationsplus") }); } }, this); diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java index 782a1231..08c9a0e1 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.ui.adapter; +package de.thedevstack.conversationsplus.ui.adapter; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.ui.ManageAccountActivity; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.ui.XmppActivity; +import de.thedevstack.conversationsplus.ui.ManageAccountActivity; import android.content.Context; import android.view.LayoutInflater; import android.view.View; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java index c42dd305..123ae9a9 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.adapter; +package de.thedevstack.conversationsplus.ui.adapter; import android.content.Context; import android.content.res.Resources; @@ -20,30 +20,17 @@ import java.util.List; import java.util.concurrent.RejectedExecutionException; import de.tzur.conversations.Settings; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.Presences; -import eu.siacs.conversations.ui.ConversationActivity; -import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.utils.UIHelper; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.Presences; +import de.thedevstack.conversationsplus.ui.ConversationActivity; +import de.thedevstack.conversationsplus.ui.XmppActivity; +import de.thedevstack.conversationsplus.utils.UIHelper; import github.ankushsachdeva.emojicon.EmojiconTextView; -import android.content.Context; -import android.graphics.Color; -import android.graphics.Typeface; -import android.preference.PreferenceManager; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ImageView; -import android.widget.TextView; - public class ConversationAdapter extends ArrayAdapter<Conversation> { private XmppActivity activity; @@ -226,4 +213,4 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { return bitmapWorkerTaskReference.get(); } } -}
\ No newline at end of file +} diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/KnownHostsAdapter.java index 0993735f..7bca0aa6 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/KnownHostsAdapter.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.adapter; +package de.thedevstack.conversationsplus.ui.adapter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java index 4187ec60..114e5cff 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java @@ -1,15 +1,15 @@ -package eu.siacs.conversations.ui.adapter; +package de.thedevstack.conversationsplus.ui.adapter; import java.lang.ref.WeakReference; import java.util.List; import java.util.concurrent.RejectedExecutionException; import de.tzur.conversations.Settings; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.ListItem; +import de.thedevstack.conversationsplus.ui.XmppActivity; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; import android.content.Context; import android.content.SharedPreferences; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java index b7ac3092..67391136 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java @@ -1,11 +1,10 @@ -package eu.siacs.conversations.ui.adapter; +package de.thedevstack.conversationsplus.ui.adapter; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.Typeface; import android.net.Uri; -import android.preference.PreferenceManager; import android.text.Spannable; import android.text.SpannableString; import android.text.Spanned; @@ -27,18 +26,18 @@ import android.widget.Toast; import java.util.List; import de.tzur.conversations.Settings; -import eu.siacs.conversations.Config; -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.Transferable; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.Message.FileParams; -import eu.siacs.conversations.ui.ConversationActivity; -import eu.siacs.conversations.utils.GeoHelper; -import eu.siacs.conversations.utils.UIHelper; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.Message.FileParams; +import de.thedevstack.conversationsplus.ui.ConversationActivity; +import de.thedevstack.conversationsplus.utils.GeoHelper; +import de.thedevstack.conversationsplus.utils.UIHelper; import github.ankushsachdeva.emojicon.EmojiconTextView; public class MessageAdapter extends ArrayAdapter<Message> { |