Update package

src/org/thoughtcrime/securesms/ApplicationContext.java

@@ -88,6 +88,7 @@ import java.util.concurrent.TimeUnit;
 import dagger.ObjectGraph;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
+import network.loki.messenger.BuildConfig;
 
 /**
  * Will be called once when the TextSecure process is created.

src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -54,6 +54,8 @@ import org.whispersystems.signalservice.loki.utilities.SerializationKt;
 
 import java.io.File;
 
+import network.loki.messenger.R;
+
 /**
  * The Activity for application preference display and management.
  *

src/org/thoughtcrime/securesms/BaseActivity.java

@@ -15,6 +15,8 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageActivityHelper;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 
+import network.loki.messenger.R;
+
 public abstract class BaseActivity extends FragmentActivity {
   @Override
   public boolean onKeyDown(int keyCode, KeyEvent event) {

src/org/thoughtcrime/securesms/BasicIntroFragment.java

@@ -8,6 +8,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import network.loki.messenger.R;
+
 public class BasicIntroFragment extends Fragment {
 
   private static final String ARG_DRAWABLE = "drawable";

src/org/thoughtcrime/securesms/BlockedContactsActivity.java

@@ -26,6 +26,8 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
+import network.loki.messenger.R;
+
 public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity {
 
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();

src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java

@@ -5,6 +5,8 @@ import android.app.Activity;
 import android.content.Intent;
 import android.support.v7.app.AlertDialog;
 
+import network.loki.messenger.R;
+
 public class ClearProfileAvatarActivity extends Activity {
 
   @Override

src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java

@@ -31,6 +31,8 @@ import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 
 import java.io.IOException;
 
+import network.loki.messenger.R;
+
 import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
 
 public class ConfirmIdentityDialog extends AlertDialog {

src/org/thoughtcrime/securesms/ContactSelectionActivity.java

@@ -20,10 +20,10 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
-import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
@@ -34,6 +34,8 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 
+import network.loki.messenger.R;
+
 /**
  * Base activity container for selecting a list of contacts.
  *

src/org/thoughtcrime/securesms/ContactSelectionListFragment.java

@@ -56,6 +56,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import network.loki.messenger.R;
+
 /**
  * Fragment for selecting a one or more contacts from a list.
  *

src/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -60,6 +60,8 @@ import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 
 import java.util.List;
 
+import network.loki.messenger.R;
+
 public class ConversationListActivity extends PassphraseRequiredActionBarActivity
     implements ConversationListFragment.ConversationSelectedListener
 {

src/org/thoughtcrime/securesms/ConversationListAdapter.java

@@ -39,6 +39,8 @@ import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
+import network.loki.messenger.R;
+
 /**
  * A CursorAdapter for building a list of conversation threads.
  *

src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java

@@ -9,6 +9,8 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
+import network.loki.messenger.R;
+
 public class ConversationListArchiveActivity extends PassphraseRequiredActionBarActivity
     implements ConversationListFragment.ConversationSelectedListener
 {

src/org/thoughtcrime/securesms/ConversationListFragment.java

@@ -90,6 +90,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
+import network.loki.messenger.R;
+
 
 public class ConversationListFragment extends Fragment
   implements LoaderManager.LoaderCallbacks<Cursor>, ActionMode.Callback, ItemClickListener

src/org/thoughtcrime/securesms/ConversationListItem.java

@@ -51,6 +51,8 @@ import java.util.Collections;
 import java.util.Locale;
 import java.util.Set;
 
+import network.loki.messenger.R;
+
 public class ConversationListItem extends RelativeLayout
                                   implements RecipientModifiedListener,
                                              BindableConversationListItem, Unbindable

src/org/thoughtcrime/securesms/ConversationListItemAction.java

@@ -15,6 +15,8 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 import java.util.Locale;
 import java.util.Set;
 
+import network.loki.messenger.R;
+
 public class ConversationListItemAction extends LinearLayout implements BindableConversationListItem {
 
   private TextView description;

src/org/thoughtcrime/securesms/CountrySelectionActivity.java

@@ -3,7 +3,8 @@ package org.thoughtcrime.securesms;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+
+import network.loki.messenger.R;
 
 public class CountrySelectionActivity extends BaseActivity
     implements CountrySelectionFragment.CountrySelectedListener

src/org/thoughtcrime/securesms/CountrySelectionFragment.java

@@ -14,12 +14,13 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 
-
 import org.thoughtcrime.securesms.database.loaders.CountryListLoader;
 
 import java.util.ArrayList;
 import java.util.Map;
 
+import network.loki.messenger.R;
+
 public class CountrySelectionFragment extends ListFragment implements LoaderManager.LoaderCallbacks<ArrayList<Map<String, String>>> {
 
   private EditText countryFilter;

src/org/thoughtcrime/securesms/CreateProfileActivity.java

@@ -65,6 +65,8 @@ import java.util.concurrent.ExecutionException;
 
 import javax.inject.Inject;
 
+import network.loki.messenger.R;
+
 @SuppressLint("StaticFieldLeak")
 public class CreateProfileActivity extends BaseActionBarActivity implements InjectableType {
 

src/org/thoughtcrime/securesms/DatabaseMigrationActivity.java

@@ -21,6 +21,8 @@ import org.thoughtcrime.securesms.database.SmsMigrator.ProgressDescription;
 import org.thoughtcrime.securesms.service.ApplicationMigrationService;
 import org.thoughtcrime.securesms.service.ApplicationMigrationService.ImportState;
 
+import network.loki.messenger.R;
+
 public class DatabaseMigrationActivity extends PassphraseRequiredActionBarActivity {
 
   private final ImportServiceConnection serviceConnection  = new ImportServiceConnection();

src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java

@@ -25,14 +25,12 @@ import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceManager;
-
-import org.thoughtcrime.securesms.color.MaterialColor;
-import org.thoughtcrime.securesms.contacts.avatars.ContactColorsLegacy;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.View;
 import android.widget.ProgressBar;
 
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
+import org.thoughtcrime.securesms.color.MaterialColor;
+import org.thoughtcrime.securesms.contacts.avatars.ContactColorsLegacy;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
@@ -46,6 +44,7 @@ import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.jobs.PushDecryptJob;
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.service.KeyCachingService;
@@ -60,6 +59,8 @@ import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import network.loki.messenger.R;
+
 public class DatabaseUpgradeActivity extends BaseActivity {
   private static final String TAG = DatabaseUpgradeActivity.class.getSimpleName();
 

src/org/thoughtcrime/securesms/DeviceActivity.java

@@ -11,8 +11,6 @@ import android.os.Vibrator;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.transition.TransitionInflater;
-
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -20,6 +18,7 @@ import android.widget.Toast;
 
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.push.AccountManagerFactory;
 import org.thoughtcrime.securesms.qr.ScanListener;
@@ -40,6 +39,8 @@ import org.whispersystems.signalservice.internal.push.DeviceLimitExceededExcepti
 
 import java.io.IOException;
 
+import network.loki.messenger.R;
+
 public class DeviceActivity extends PassphraseRequiredActionBarActivity
     implements Button.OnClickListener, ScanListener, DeviceLinkFragment.LinkClickedListener
 {

src/org/thoughtcrime/securesms/DeviceAddFragment.java

@@ -19,6 +19,8 @@ import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.qr.ScanningThread;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
+import network.loki.messenger.R;
+
 public class DeviceAddFragment extends Fragment {
 
   private ViewGroup      container;

src/org/thoughtcrime/securesms/DeviceLinkFragment.java

@@ -10,6 +10,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import network.loki.messenger.R;
+
 public class DeviceLinkFragment extends Fragment implements View.OnClickListener {
 
   private LinearLayout        container;

src/org/thoughtcrime/securesms/DeviceListFragment.java

@@ -9,10 +9,6 @@ import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.support.v7.app.AlertDialog;
-
-import org.thoughtcrime.securesms.devicelist.Device;
-import org.thoughtcrime.securesms.jobs.RefreshUnidentifiedDeliveryAbilityJob;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,9 +22,12 @@ import com.melnykov.fab.FloatingActionButton;
 
 import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
-import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
+import org.thoughtcrime.securesms.devicelist.Device;
+import org.thoughtcrime.securesms.jobs.RefreshUnidentifiedDeliveryAbilityJob;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 
 import java.io.IOException;
@@ -37,6 +36,8 @@ import java.util.Locale;
 
 import javax.inject.Inject;
 
+import network.loki.messenger.R;
+
 public class DeviceListFragment extends ListFragment
     implements LoaderManager.LoaderCallbacks<List<Device>>,
                ListView.OnItemClickListener, InjectableType, Button.OnClickListener

src/org/thoughtcrime/securesms/DeviceListItem.java

@@ -11,6 +11,8 @@ import org.thoughtcrime.securesms.util.DateUtils;
 
 import java.util.Locale;
 
+import network.loki.messenger.R;
+
 public class DeviceListItem extends LinearLayout {
 
   private long     deviceId;

src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java

@@ -5,6 +5,8 @@ import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.view.Window;
 
+import network.loki.messenger.R;
+
 public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActivity {
 
   @SuppressWarnings("unused")

src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java

@@ -29,6 +29,8 @@ import org.whispersystems.libsignal.util.guava.Optional;
 import java.util.Collections;
 import java.util.List;
 
+import network.loki.messenger.R;
+
 public class ExperienceUpgradeActivity extends BaseActionBarActivity implements TypingIndicatorIntroFragment.Controller, LinkPreviewsIntroFragment.Controller {
   private static final String TAG             = ExperienceUpgradeActivity.class.getSimpleName();
   private static final String DISMISS_ACTION  = "org.thoughtcrime.securesms.ExperienceUpgradeActivity.DISMISS_ACTION";

src/org/thoughtcrime/securesms/ExpirationDialog.java

@@ -10,6 +10,7 @@ import android.widget.TextView;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 
 import cn.carbswang.android.numberpickerview.library.NumberPickerView;
+import network.loki.messenger.R;
 
 public class ExpirationDialog extends AlertDialog {
 

src/org/thoughtcrime/securesms/GroupCreateActivity.java

@@ -26,10 +26,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-
-import org.thoughtcrime.securesms.avatar.AvatarSelection;
-import org.thoughtcrime.securesms.conversation.ConversationActivity;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -44,12 +40,14 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
 
+import org.thoughtcrime.securesms.avatar.AvatarSelection;
 import org.thoughtcrime.securesms.components.PushRecipientsPanel;
 import org.thoughtcrime.securesms.components.PushRecipientsPanel.RecipientsPanelChangedListener;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.RecipientsEditor;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
+import org.thoughtcrime.securesms.conversation.ConversationActivity;
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
@@ -58,6 +56,7 @@ import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.groups.GroupManager;
 import org.thoughtcrime.securesms.groups.GroupManager.GroupActionResult;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.BitmapUtil;
@@ -78,6 +77,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import network.loki.messenger.R;
+
 /**
  * Activity to create and update groups
  *

src/org/thoughtcrime/securesms/GroupMembersDialog.java

@@ -15,6 +15,8 @@ import org.thoughtcrime.securesms.util.Util;
 import java.util.LinkedList;
 import java.util.List;
 
+import network.loki.messenger.R;
+
 public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
 
   private static final String TAG = GroupMembersDialog.class.getSimpleName();

src/org/thoughtcrime/securesms/InviteActivity.java

@@ -38,6 +38,8 @@ import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 
 import java.util.concurrent.ExecutionException;
 
+import network.loki.messenger.R;
+
 public class InviteActivity extends PassphraseRequiredActionBarActivity implements ContactSelectionListFragment.OnContactSelectedListener {
 
   private ContactSelectionListFragment contactsFragment;

src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java

@@ -11,6 +11,8 @@ import android.view.ViewGroup;
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
+import network.loki.messenger.R;
+
 public class LinkPreviewsIntroFragment extends Fragment {
 
   private Controller controller;

src/org/thoughtcrime/securesms/LogSubmitActivity.java

@@ -4,13 +4,15 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.logsubmit.SubmitLogFragment;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
+import network.loki.messenger.R;
+
 /**
  * Activity for submitting logcat logs to a pastebin service.
  */

src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java

@@ -31,6 +31,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
+import network.loki.messenger.R;
+
 import static com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager.TAG;
 
 public class MediaDocumentsAdapter extends CursorRecyclerViewAdapter<ViewHolder> implements StickyHeaderDecoration.StickyHeaderAdapter<HeaderViewHolder> {

src/org/thoughtcrime/securesms/MediaGalleryAdapter.java

@@ -37,6 +37,8 @@ import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
+import network.loki.messenger.R;
+
 class MediaGalleryAdapter extends StickyHeaderGridAdapter {
 
   @SuppressWarnings("unused")

src/org/thoughtcrime/securesms/MediaOverviewActivity.java

@@ -75,6 +75,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 
+import network.loki.messenger.R;
+
 /**
  * Activity for displaying media attachments in-app
  */

src/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -76,6 +76,8 @@ import org.thoughtcrime.securesms.util.Util;
 import java.io.IOException;
 import java.util.WeakHashMap;
 
+import network.loki.messenger.R;
+
 /**
  * Activity for displaying media attachments in-app
  */

src/org/thoughtcrime/securesms/MessageDetailsActivity.java

@@ -29,9 +29,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
 import android.support.v4.content.Loader;
-
-import org.thoughtcrime.securesms.conversation.ConversationItem;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -41,6 +38,7 @@ import android.widget.TextView;
 
 import org.thoughtcrime.securesms.MessageDetailsRecipientAdapter.RecipientDeliveryStatus;
 import org.thoughtcrime.securesms.color.MaterialColor;
+import org.thoughtcrime.securesms.conversation.ConversationItem;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase.GroupReceiptInfo;
@@ -49,6 +47,7 @@ import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.loaders.MessageDetailsLoader;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
@@ -70,6 +69,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 
+import network.loki.messenger.R;
+
 /**
  * @author Jake McGinty
  */

src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java

@@ -17,6 +17,8 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
 
+import network.loki.messenger.R;
+
 class MessageDetailsRecipientAdapter extends BaseAdapter implements AbsListView.RecyclerListener {
 
   private final Context                       context;

src/org/thoughtcrime/securesms/MessageRecipientListItem.java

@@ -38,6 +38,8 @@ import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 
+import network.loki.messenger.R;
+
 /**
  * A simple view to show the recipients of a message
  *

src/org/thoughtcrime/securesms/MuteDialog.java

@@ -7,6 +7,8 @@ import android.support.v7.app.AlertDialog;
 
 import java.util.concurrent.TimeUnit;
 
+import network.loki.messenger.R;
+
 public class MuteDialog extends AlertDialog {
 
 

src/org/thoughtcrime/securesms/NewConversationActivity.java

@@ -28,6 +28,8 @@ import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.whispersystems.signalservice.loki.utilities.PublicKeyValidation;
 
+import network.loki.messenger.R;
+
 /**
  * Activity container for starting a new conversation.
  *

src/org/thoughtcrime/securesms/PassphraseChangeActivity.java

@@ -20,7 +20,6 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.Editable;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -29,10 +28,13 @@ import android.widget.EditText;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
+import network.loki.messenger.R;
+
 /**
  * Activity for changing a user's local encryption passphrase.
  *

src/org/thoughtcrime/securesms/PassphraseCreateActivity.java

@@ -26,6 +26,8 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.VersionTracker;
 
+import network.loki.messenger.R;
+
 /**
  * Activity for creating a user's local encryption passphrase.
  *

src/org/thoughtcrime/securesms/PassphrasePromptActivity.java

@@ -32,7 +32,6 @@ import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.TypefaceSpan;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -54,10 +53,13 @@ import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.DynamicIntroTheme;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
+import network.loki.messenger.R;
+
 /**
  * Activity that prompts for a user's passphrase.
  *

src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java

@@ -26,7 +26,8 @@ import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 
 import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.GooglePlayServicesUtil;
+
+import network.loki.messenger.R;
 
 public class PlayServicesProblemFragment extends DialogFragment {
 

src/org/thoughtcrime/securesms/PromptMmsActivity.java

@@ -6,6 +6,8 @@ import android.widget.Button;
 
 import org.thoughtcrime.securesms.preferences.MmsPreferencesActivity;
 
+import network.loki.messenger.R;
+
 public class PromptMmsActivity extends PassphraseRequiredActionBarActivity {
 
   @Override

src/org/thoughtcrime/securesms/PushContactSelectionActivity.java

@@ -22,6 +22,8 @@ import android.os.Bundle;
 import java.util.ArrayList;
 import java.util.List;
 
+import network.loki.messenger.R;
+
 /**
  * Activity container for selecting a list of contacts.
  *

src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java

@@ -12,6 +12,8 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
+import network.loki.messenger.R;
+
 public class ReadReceiptsIntroFragment extends Fragment {
 
   public static ReadReceiptsIntroFragment newInstance() {

src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java

@@ -84,6 +84,8 @@ import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.util.concurrent.ExecutionException;
 
+import network.loki.messenger.R;
+
 @SuppressLint("StaticFieldLeak")
 public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActivity implements RecipientModifiedListener, LoaderManager.LoaderCallbacks<Cursor>
 {

src/org/thoughtcrime/securesms/RegistrationActivity.java

@@ -101,6 +101,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
+import network.loki.messenger.R;
+
 /**
  * The register account activity.  Prompts ths user for their registration information
  * and begins the account registration process.

src/org/thoughtcrime/securesms/ShareActivity.java

@@ -32,19 +32,17 @@ import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
-
-import org.thoughtcrime.securesms.conversation.ConversationActivity;
-import org.thoughtcrime.securesms.logging.Log;
-
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 
 import org.thoughtcrime.securesms.components.SearchToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.conversation.ConversationActivity;
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.providers.BlobProvider;
@@ -62,6 +60,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 
+import network.loki.messenger.R;
+
 /**
  * An activity to quickly share content with contacts
  *

src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java

@@ -14,6 +14,8 @@ import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 
+import network.loki.messenger.R;
+
 public class ShortcutLauncherActivity extends AppCompatActivity {
 
   private static final String KEY_SERIALIZED_ADDRESS = "serialized_address";

src/org/thoughtcrime/securesms/SmsSendtoActivity.java

@@ -19,6 +19,8 @@ import org.thoughtcrime.securesms.util.Rfc5724Uri;
 
 import java.net.URISyntaxException;
 
+import network.loki.messenger.R;
+
 public class SmsSendtoActivity extends Activity {
 
   private static final String TAG = SmsSendtoActivity.class.getSimpleName();

src/org/thoughtcrime/securesms/TransportOptions.java

@@ -20,6 +20,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
+import network.loki.messenger.R;
+
 import static org.thoughtcrime.securesms.TransportOption.Type;
 
 public class TransportOptions {

src/org/thoughtcrime/securesms/TransportOptionsAdapter.java

@@ -14,6 +14,8 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.List;
 
+import network.loki.messenger.R;
+
 public class TransportOptionsAdapter extends BaseAdapter {
 
   private final LayoutInflater inflater;

src/org/thoughtcrime/securesms/TransportOptionsPopup.java

@@ -10,6 +10,8 @@ import android.widget.ListView;
 import java.util.LinkedList;
 import java.util.List;
 
+import network.loki.messenger.R;
+
 public class TransportOptionsPopup extends ListPopupWindow implements ListView.OnItemClickListener {
 
   private final TransportOptionsAdapter adapter;

src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java

@@ -12,6 +12,8 @@ import org.thoughtcrime.securesms.components.TypingIndicatorView;
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
+import network.loki.messenger.R;
+
 public class TypingIndicatorIntroFragment extends Fragment {
 
   private Controller controller;

src/org/thoughtcrime/securesms/VerifyIdentityActivity.java

@@ -43,7 +43,6 @@ import android.support.v7.widget.SwitchCompat;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
@@ -69,6 +68,7 @@ import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
 import org.thoughtcrime.securesms.jobs.MultiDeviceVerifiedUpdateJob;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.qr.QrCode;
 import org.thoughtcrime.securesms.qr.ScanListener;
@@ -90,6 +90,8 @@ import org.whispersystems.libsignal.fingerprint.NumericFingerprintGenerator;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 
+import network.loki.messenger.R;
+
 import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
 
 /**

src/org/thoughtcrime/securesms/WebRtcCallActivity.java

@@ -24,11 +24,9 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.media.AudioManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -41,17 +39,18 @@ import org.thoughtcrime.securesms.components.webrtc.WebRtcCallControls;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallScreen;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.WebRtcCallService;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 
+import network.loki.messenger.R;
+
 import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
 
 public class WebRtcCallActivity extends Activity {

src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java

@@ -21,7 +21,6 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultLoadControl;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.LoadControl;
 import com.google.android.exoplayer2.Player;
@@ -33,8 +32,6 @@ import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
-import org.thoughtcrime.securesms.BuildConfig;
-import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.AttachmentServer;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.AudioSlide;
@@ -45,6 +42,9 @@ import org.whispersystems.libsignal.util.guava.Optional;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 
+import network.loki.messenger.BuildConfig;
+import network.loki.messenger.R;
+
 public class AudioSlidePlayer implements SensorEventListener {
 
   private static final String TAG = AudioSlidePlayer.class.getSimpleName();

src/org/thoughtcrime/securesms/avatar/AvatarSelection.java

@@ -13,7 +13,7 @@ import android.support.v4.content.ContextCompat;
 import com.theartofdev.edmodo.cropper.CropImage;
 import com.theartofdev.edmodo.cropper.CropImageView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.FileProviderUtil;

src/org/thoughtcrime/securesms/backup/BackupDialog.java

@@ -11,7 +11,7 @@ import android.widget.CheckBox;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.util.BackupUtil;

src/org/thoughtcrime/securesms/color/MaterialColor.java

@@ -6,7 +6,7 @@ import android.support.annotation.ColorInt;
 import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 import java.util.HashMap;
 import java.util.Map;

src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java

@@ -10,7 +10,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;

src/org/thoughtcrime/securesms/components/AlertView.java

@@ -10,7 +10,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 public class AlertView extends LinearLayout {
 

src/org/thoughtcrime/securesms/components/AnimatingToggle.java

@@ -11,7 +11,7 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class AnimatingToggle extends FrameLayout {

src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java

@@ -26,7 +26,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.ViewUtil;
 

src/org/thoughtcrime/securesms/components/AudioView.java

@@ -24,7 +24,7 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.audio.AudioSlidePlayer;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.events.PartProgressEvent;

src/org/thoughtcrime/securesms/components/AvatarImageView.java

@@ -16,7 +16,7 @@ import android.view.ViewOutlineProvider;
 
 import com.lelloman.identicon.drawable.ClassicIdenticonDrawable;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientExporter;

src/org/thoughtcrime/securesms/components/BubbleDrawableBuilder.java

@@ -5,7 +5,7 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 public class BubbleDrawableBuilder {
   private int color;

src/org/thoughtcrime/securesms/components/CircleColorImageView.java

@@ -9,7 +9,7 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 public class CircleColorImageView extends ImageView {
 

src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java

@@ -13,7 +13,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class ContactFilterToolbar extends Toolbar {

src/org/thoughtcrime/securesms/components/ConversationItemFooter.java

@@ -14,7 +14,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.permissions.Permissions;

src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java

@@ -14,7 +14,7 @@ import android.util.AttributeSet;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;

src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java

@@ -8,7 +8,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 /**
  * Bottom navigation bar shown in the {@link org.thoughtcrime.securesms.conversation.ConversationActivity}

src/org/thoughtcrime/securesms/components/ConversationTypingView.java

@@ -8,7 +8,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 

src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java

@@ -20,7 +20,7 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.components.CustomDefaultPreference.CustomDefaultPreferenceDialogFragmentCompat.CustomPreferenceValidator;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 

src/org/thoughtcrime/securesms/components/DeliveryStatusView.java

@@ -14,7 +14,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 import pl.tajchert.sample.DotsTextView;
 

src/org/thoughtcrime/securesms/components/DocumentView.java

@@ -19,7 +19,7 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
 import org.thoughtcrime.securesms.mms.DocumentSlide;

src/org/thoughtcrime/securesms/components/ExpirationTimerView.java

@@ -5,7 +5,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.lang.ref.WeakReference;

src/org/thoughtcrime/securesms/components/FromTextView.java

@@ -13,7 +13,7 @@ import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.util.AttributeSet;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ResUtil;

src/org/thoughtcrime/securesms/components/HidingLinearLayout.java

@@ -14,7 +14,7 @@ import android.view.animation.ScaleAnimation;
 import android.view.animation.TranslateAnimation;
 import android.widget.LinearLayout;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 public class HidingLinearLayout extends LinearLayout {
 

src/org/thoughtcrime/securesms/components/HourglassView.java

@@ -14,7 +14,7 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 public class HourglassView extends View {
 

src/org/thoughtcrime/securesms/components/ImageDivet.java

@@ -7,7 +7,7 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 public class ImageDivet extends ImageView {
   private static final float CORNER_OFFSET = 12F;

src/org/thoughtcrime/securesms/components/InputPanel.java

@@ -22,7 +22,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiDrawer;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;

src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java

@@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import android.view.Surface;
 import android.view.View;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.Util;
 

src/org/thoughtcrime/securesms/components/LabeledEditText.java

@@ -16,7 +16,7 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 public class LabeledEditText extends FrameLayout implements View.OnFocusChangeListener {
 

src/org/thoughtcrime/securesms/components/LinkPreviewView.java

@@ -12,7 +12,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.ImageSlide;

src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java

@@ -6,7 +6,7 @@ import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.ScrollView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 public class MaxHeightScrollView extends ScrollView {
 

src/org/thoughtcrime/securesms/components/MediaView.java

@@ -13,7 +13,7 @@ import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.VideoSlide;
 import org.thoughtcrime.securesms.util.views.Stub;

src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java

@@ -20,7 +20,7 @@ import android.view.animation.TranslateAnimation;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.ViewUtil;
 

src/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java

@@ -20,7 +20,7 @@ import com.bumptech.glide.load.resource.bitmap.FitCenter;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;

src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java

@@ -26,7 +26,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.RelativeLayout;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.contacts.RecipientsAdapter;
 import org.thoughtcrime.securesms.contacts.RecipientsEditor;
 import org.thoughtcrime.securesms.database.Address;

src/org/thoughtcrime/securesms/components/QuoteView.java

@@ -20,7 +20,7 @@ import android.widget.TextView;
 import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequests;

src/org/thoughtcrime/securesms/components/RatingManager.java

@@ -10,7 +10,7 @@ import android.support.v7.app.AlertDialog;
 import org.thoughtcrime.securesms.logging.Log;
 import android.widget.Toast;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.concurrent.TimeUnit;

src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java

@@ -26,7 +26,7 @@ import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.signature.MediaStoreSignature;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.loaders.RecentPhotosLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;

src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java

@@ -35,7 +35,7 @@ import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 

src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java

@@ -9,7 +9,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 
 public class RemovableEditableMediaView extends FrameLayout {
 

src/org/thoughtcrime/securesms/components/SearchToolbar.java

@@ -17,7 +17,7 @@ import android.view.ViewAnimationUtils;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 
-import org.thoughtcrime.securesms.R;
+import network.loki.messenger.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 
 public class SearchToolbar extends LinearLayout {