diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index 5193a61c20..85a413c4b7 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -25,7 +25,6 @@ import android.os.AsyncTask; import android.os.Build; import android.support.annotation.NonNull; import android.support.multidex.MultiDexApplication; -import android.util.Log; import com.google.android.gms.security.ProviderInstaller; @@ -45,6 +44,7 @@ import org.thoughtcrime.securesms.jobs.requirements.ServiceRequirementProvider; import org.thoughtcrime.securesms.jobs.requirements.SqlCipherMigrationRequirementProvider; import org.thoughtcrime.securesms.logging.AndroidLogger; import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.PersistentLogger; import org.thoughtcrime.securesms.logging.UncaughtExceptionLogger; import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess; diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java index 2a410fef4d..8bfb664cb6 100644 --- a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java +++ b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java @@ -1,7 +1,6 @@ package org.thoughtcrime.securesms; import android.annotation.TargetApi; -import android.app.ActivityOptions; import android.content.Intent; import android.os.Build; import android.os.Build.VERSION_CODES; @@ -10,13 +9,12 @@ import android.support.annotation.NonNull; import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityOptionsCompat; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.ViewConfiguration; import android.view.WindowManager; -import android.view.animation.AnimationUtils; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.TextSecurePreferences; import java.lang.reflect.Field; diff --git a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java index d61832e59b..3fb1ebc505 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java @@ -20,7 +20,7 @@ import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.components.ContactFilterToolbar; import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode; diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java index adca058835..49b3cc3bec 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -30,7 +30,6 @@ import android.support.v4.content.Loader; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -47,6 +46,7 @@ import org.thoughtcrime.securesms.contacts.ContactSelectionListItem; import org.thoughtcrime.securesms.contacts.ContactsCursorLoader; import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode; import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.util.DirectoryHelper; diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 92337c0198..bcc7e63930 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -27,7 +27,6 @@ import android.content.IntentFilter; import android.content.res.Configuration; import android.content.res.TypedArray; import android.graphics.Color; -import android.graphics.PorterDuff; import android.graphics.PorterDuff.Mode; import android.graphics.drawable.ColorDrawable; import android.net.Uri; @@ -47,7 +46,7 @@ import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import android.view.KeyEvent; import android.view.Menu; @@ -180,7 +179,6 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/org/thoughtcrime/securesms/ConversationAdapter.java b/src/org/thoughtcrime/securesms/ConversationAdapter.java index 7d7d2049c1..82b233f968 100644 --- a/src/org/thoughtcrime/securesms/ConversationAdapter.java +++ b/src/org/thoughtcrime/securesms/ConversationAdapter.java @@ -23,7 +23,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.support.v7.widget.RecyclerView; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index 912b61c2e2..a316d049eb 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -39,7 +39,7 @@ import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.OnScrollListener; import android.text.ClipboardManager; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index 540771307a..29465afbf0 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -34,7 +34,7 @@ import android.text.TextUtils; import android.text.style.URLSpan; import android.text.util.Linkify; import android.util.AttributeSet; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/ConversationPopupActivity.java b/src/org/thoughtcrime/securesms/ConversationPopupActivity.java index ab82e03794..c72eeb5a7d 100644 --- a/src/org/thoughtcrime/securesms/ConversationPopupActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationPopupActivity.java @@ -5,7 +5,7 @@ import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.support.v4.app.ActivityOptionsCompat; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.Display; import android.view.Gravity; import android.view.Menu; diff --git a/src/org/thoughtcrime/securesms/ConversationTitleView.java b/src/org/thoughtcrime/securesms/ConversationTitleView.java index 2e555e589f..d5030d1913 100644 --- a/src/org/thoughtcrime/securesms/ConversationTitleView.java +++ b/src/org/thoughtcrime/securesms/ConversationTitleView.java @@ -6,7 +6,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.RelativeLayout; @@ -21,8 +20,6 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.ViewUtil; -import java.lang.ref.WeakReference; - public class ConversationTitleView extends RelativeLayout { @SuppressWarnings("unused") diff --git a/src/org/thoughtcrime/securesms/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/ConversationUpdateItem.java index 9d6a3c2179..6eef0edc0e 100644 --- a/src/org/thoughtcrime/securesms/ConversationUpdateItem.java +++ b/src/org/thoughtcrime/securesms/ConversationUpdateItem.java @@ -8,7 +8,6 @@ import android.graphics.PorterDuffColorFilter; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; @@ -18,6 +17,7 @@ import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable; import org.thoughtcrime.securesms.database.IdentityDatabase; import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord; import org.thoughtcrime.securesms.database.model.MessageRecord; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientModifiedListener; diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java index 8d7904d5ed..56af408cb1 100644 --- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java +++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java @@ -19,7 +19,7 @@ import android.support.annotation.RequiresApi; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.KeyEvent; import android.view.View; import android.view.ViewAnimationUtils; diff --git a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java index 358c56653d..b2b82a7627 100644 --- a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java +++ b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java @@ -25,7 +25,7 @@ import android.database.Cursor; import android.os.AsyncTask; import android.os.Bundle; import android.support.v7.preference.PreferenceManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.View; import android.widget.ProgressBar; diff --git a/src/org/thoughtcrime/securesms/DeviceActivity.java b/src/org/thoughtcrime/securesms/DeviceActivity.java index 13effaa91a..5475a55956 100644 --- a/src/org/thoughtcrime/securesms/DeviceActivity.java +++ b/src/org/thoughtcrime/securesms/DeviceActivity.java @@ -11,7 +11,7 @@ import android.os.Vibrator; import android.support.annotation.NonNull; import android.text.TextUtils; import android.transition.TransitionInflater; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.MenuItem; import android.view.View; import android.widget.Button; diff --git a/src/org/thoughtcrime/securesms/DeviceAddFragment.java b/src/org/thoughtcrime/securesms/DeviceAddFragment.java index 4090e82bbb..0cfa4b6b2c 100644 --- a/src/org/thoughtcrime/securesms/DeviceAddFragment.java +++ b/src/org/thoughtcrime/securesms/DeviceAddFragment.java @@ -2,15 +2,10 @@ package org.thoughtcrime.securesms; import android.animation.Animator; import android.annotation.TargetApi; -import android.content.Context; import android.content.res.Configuration; -import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.support.v4.app.Fragment; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewAnimationUtils; @@ -19,21 +14,9 @@ import android.view.animation.DecelerateInterpolator; import android.widget.ImageView; import android.widget.LinearLayout; -import com.google.zxing.BinaryBitmap; -import com.google.zxing.ChecksumException; -import com.google.zxing.FormatException; -import com.google.zxing.NotFoundException; -import com.google.zxing.PlanarYUVLuminanceSource; -import com.google.zxing.Result; -import com.google.zxing.common.HybridBinarizer; -import com.google.zxing.qrcode.QRCodeReader; - import org.thoughtcrime.securesms.components.camera.CameraView; -import org.thoughtcrime.securesms.components.camera.CameraView.PreviewCallback; -import org.thoughtcrime.securesms.components.camera.CameraView.PreviewFrame; import org.thoughtcrime.securesms.qr.ScanListener; import org.thoughtcrime.securesms.qr.ScanningThread; -import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; public class DeviceAddFragment extends Fragment { diff --git a/src/org/thoughtcrime/securesms/DeviceListFragment.java b/src/org/thoughtcrime/securesms/DeviceListFragment.java index b504947b84..044b8947fb 100644 --- a/src/org/thoughtcrime/securesms/DeviceListFragment.java +++ b/src/org/thoughtcrime/securesms/DeviceListFragment.java @@ -9,7 +9,7 @@ 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 android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java index d2e1ae8183..53c686e7e3 100644 --- a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java +++ b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java @@ -12,7 +12,7 @@ import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.v4.app.NotificationCompat; import android.support.v4.view.ViewPager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.melnykov.fab.FloatingActionButton; import com.nineoldandroids.animation.ArgbEvaluator; diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java index 735aaaadd3..e2c2fec861 100644 --- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java +++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java @@ -26,7 +26,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/src/org/thoughtcrime/securesms/LogSubmitActivity.java b/src/org/thoughtcrime/securesms/LogSubmitActivity.java index 6c17f13aad..f36c22b7ee 100644 --- a/src/org/thoughtcrime/securesms/LogSubmitActivity.java +++ b/src/org/thoughtcrime/securesms/LogSubmitActivity.java @@ -4,7 +4,7 @@ import android.content.ActivityNotFoundException; import android.content.Intent; import android.os.Bundle; import android.support.v4.app.FragmentTransaction; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.MenuItem; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java b/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java index b90e61e05c..19096f4447 100644 --- a/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java +++ b/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java @@ -7,7 +7,6 @@ import android.content.Intent; import android.database.Cursor; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,6 +18,7 @@ import org.thoughtcrime.securesms.MediaDocumentsAdapter.ViewHolder; import org.thoughtcrime.securesms.components.DocumentView; import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter; import org.thoughtcrime.securesms.database.MediaDatabase; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.DocumentSlide; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.Slide; diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java index 2290fc054e..aa478b47a8 100644 --- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -20,7 +20,6 @@ import android.Manifest; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.database.Cursor; import android.net.Uri; @@ -36,7 +35,7 @@ import android.support.v4.util.Pair; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.support.v7.app.AlertDialog; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -48,13 +47,10 @@ import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.Toast; -import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.components.MediaView; import org.thoughtcrime.securesms.components.viewpager.ExtendedOnPageChangedListener; import org.thoughtcrime.securesms.database.Address; -import org.thoughtcrime.securesms.database.AttachmentDatabase; -import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord; import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader; import org.thoughtcrime.securesms.mms.GlideApp; diff --git a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java index ca4815ec52..b983fd7aa3 100644 --- a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java +++ b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java @@ -27,7 +27,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.LoaderManager.LoaderCallbacks; import android.support.v4.content.Loader; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/PassphraseActivity.java b/src/org/thoughtcrime/securesms/PassphraseActivity.java index 71bbc2cc3e..c8a3152c3a 100644 --- a/src/org/thoughtcrime/securesms/PassphraseActivity.java +++ b/src/org/thoughtcrime/securesms/PassphraseActivity.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.os.IBinder; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.service.KeyCachingService; diff --git a/src/org/thoughtcrime/securesms/PassphraseChangeActivity.java b/src/org/thoughtcrime/securesms/PassphraseChangeActivity.java index b77e86c649..f3db4b771c 100644 --- a/src/org/thoughtcrime/securesms/PassphraseChangeActivity.java +++ b/src/org/thoughtcrime/securesms/PassphraseChangeActivity.java @@ -20,7 +20,7 @@ import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; import android.text.Editable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java index f218466afd..9d8fd1b168 100644 --- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java +++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java @@ -32,7 +32,7 @@ import android.text.SpannableString; import android.text.Spanned; import android.text.style.RelativeSizeSpan; import android.text.style.TypefaceSpan; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java index 507ed7e874..559511bc0f 100644 --- a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java +++ b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java @@ -9,7 +9,7 @@ import android.support.annotation.IdRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.crypto.MasterSecretUtil; import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob; diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java index a2206a614c..30ac7dbdaa 100644 --- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java +++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java @@ -28,7 +28,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; import android.support.v7.widget.Toolbar; import android.telephony.PhoneNumberUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import android.view.MenuItem; import android.view.View; @@ -59,7 +59,6 @@ import org.thoughtcrime.securesms.preferences.widgets.ColorPickerPreference; import org.thoughtcrime.securesms.preferences.widgets.ContactPreference; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientModifiedListener; -import org.thoughtcrime.securesms.service.WebRtcCallService; import org.thoughtcrime.securesms.util.CommunicationActions; import org.thoughtcrime.securesms.util.Dialogs; import org.thoughtcrime.securesms.util.DynamicLanguage; diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java index 61736b0d21..719d8f85e3 100644 --- a/src/org/thoughtcrime/securesms/RegistrationActivity.java +++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java @@ -25,7 +25,7 @@ import android.text.TextUtils; import android.text.TextWatcher; import android.text.method.LinkMovementMethod; import android.text.style.ClickableSpan; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import android.view.KeyEvent; import android.view.LayoutInflater; diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java index 60ace0ebe6..e573337c92 100644 --- a/src/org/thoughtcrime/securesms/ShareActivity.java +++ b/src/org/thoughtcrime/securesms/ShareActivity.java @@ -32,13 +32,12 @@ import android.support.annotation.Nullable; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; -import android.util.Log; +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; import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/SmsSendtoActivity.java b/src/org/thoughtcrime/securesms/SmsSendtoActivity.java index 8134e3dcf3..7e3337f043 100644 --- a/src/org/thoughtcrime/securesms/SmsSendtoActivity.java +++ b/src/org/thoughtcrime/securesms/SmsSendtoActivity.java @@ -7,7 +7,7 @@ import android.os.Bundle; import android.provider.ContactsContract; import android.support.annotation.NonNull; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.widget.Toast; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java index 3ad8e7c5c2..aa3e3d829e 100644 --- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java +++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java @@ -43,7 +43,7 @@ import android.support.v7.widget.SwitchCompat; import android.text.Html; import android.text.TextUtils; import android.text.method.LinkMovementMethod; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; diff --git a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java index 096b0ff4c9..f52440f507 100644 --- a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java +++ b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java @@ -28,7 +28,7 @@ import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.app.AlertDialog; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.View; import android.view.Window; import android.view.WindowManager; @@ -49,7 +49,6 @@ import org.thoughtcrime.securesms.service.WebRtcCallService; import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.ViewUtil; -import org.thoughtcrime.securesms.webrtc.CameraState; import org.whispersystems.libsignal.IdentityKey; import org.whispersystems.libsignal.SignalProtocolAddress; diff --git a/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java b/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java index 9fdb0bd7b0..c4710872f7 100644 --- a/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java +++ b/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.attachments; import android.content.Context; import android.net.Uri; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.spongycastle.util.encoders.Hex; import org.thoughtcrime.securesms.mms.PartAuthority; diff --git a/src/org/thoughtcrime/securesms/audio/AudioCodec.java b/src/org/thoughtcrime/securesms/audio/AudioCodec.java index bac295854a..210daac581 100644 --- a/src/org/thoughtcrime/securesms/audio/AudioCodec.java +++ b/src/org/thoughtcrime/securesms/audio/AudioCodec.java @@ -8,7 +8,7 @@ import android.media.MediaCodecInfo; import android.media.MediaFormat; import android.media.MediaRecorder; import android.os.Build; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Util; diff --git a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java b/src/org/thoughtcrime/securesms/audio/AudioRecorder.java index 49a59c0161..cc873ec872 100644 --- a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java +++ b/src/org/thoughtcrime/securesms/audio/AudioRecorder.java @@ -6,7 +6,7 @@ import android.net.Uri; import android.os.Build; import android.os.ParcelFileDescriptor; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import org.thoughtcrime.securesms.providers.PersistentBlobProvider; diff --git a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java index d641f7f518..fff1bf4c33 100644 --- a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java +++ b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java @@ -14,13 +14,12 @@ import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import android.util.Pair; import android.widget.Toast; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.AttachmentServer; -import org.thoughtcrime.securesms.crypto.MasterSecret; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.AudioSlide; import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.Util; diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java index ba165b2699..9e41a39183 100644 --- a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java +++ b/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java @@ -6,7 +6,6 @@ import android.database.Cursor; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; import com.annimon.stream.function.Consumer; import com.annimon.stream.function.Predicate; @@ -29,6 +28,7 @@ import org.thoughtcrime.securesms.database.SearchDatabase; import org.thoughtcrime.securesms.database.SessionDatabase; import org.thoughtcrime.securesms.database.SignedPreKeyDatabase; import org.thoughtcrime.securesms.database.SmsDatabase; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.util.Conversions; import org.thoughtcrime.securesms.util.Util; diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java index 29b2f2ceec..76daab62b6 100644 --- a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java +++ b/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java @@ -7,7 +7,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.database.Cursor; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import net.sqlcipher.database.SQLiteDatabase; @@ -26,7 +26,6 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.GroupReceiptDatabase; import org.thoughtcrime.securesms.database.MmsDatabase; -import org.thoughtcrime.securesms.database.MmsSmsColumns; import org.thoughtcrime.securesms.database.SearchDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.profiles.AvatarHelper; @@ -45,7 +44,6 @@ import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/src/org/thoughtcrime/securesms/components/AudioView.java index 8d345cc1a1..55895aa566 100644 --- a/src/org/thoughtcrime/securesms/components/AudioView.java +++ b/src/org/thoughtcrime/securesms/components/AudioView.java @@ -11,7 +11,6 @@ import android.os.Build; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.AttributeSet; -import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; @@ -29,6 +28,7 @@ import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.audio.AudioSlidePlayer; import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.events.PartProgressEvent; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.AudioSlide; import org.thoughtcrime.securesms.mms.SlideClickListener; import org.thoughtcrime.securesms.util.Util; diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/src/org/thoughtcrime/securesms/components/ComposeText.java index 0b027f9128..44ac4b148c 100644 --- a/src/org/thoughtcrime/securesms/components/ComposeText.java +++ b/src/org/thoughtcrime/securesms/components/ComposeText.java @@ -19,7 +19,7 @@ import android.text.TextUtils; import android.text.TextUtils.TruncateAt; import android.text.style.RelativeSizeSpan; import android.util.AttributeSet; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; diff --git a/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java index 81289c6f75..d7770ebd22 100644 --- a/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java +++ b/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java @@ -12,7 +12,7 @@ import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.util.AttributeSet; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.View; import android.widget.AdapterView; import android.widget.Button; diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java index 05fd5ed94d..5452bfe02d 100644 --- a/src/org/thoughtcrime/securesms/components/InputPanel.java +++ b/src/org/thoughtcrime/securesms/components/InputPanel.java @@ -9,7 +9,6 @@ import android.support.annotation.Nullable; import android.support.v4.view.ViewCompat; import android.text.format.DateUtils; import android.util.AttributeSet; -import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.animation.AlphaAnimation; @@ -23,6 +22,7 @@ import android.widget.Toast; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.emoji.EmojiDrawer; import org.thoughtcrime.securesms.components.emoji.EmojiToggle; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.QuoteModel; import org.thoughtcrime.securesms.mms.SlideDeck; diff --git a/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java index 9ba149b776..a326c7fe7d 100644 --- a/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java +++ b/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java @@ -24,7 +24,7 @@ import android.os.Build.VERSION_CODES; import android.preference.PreferenceManager; import android.support.v7.widget.LinearLayoutCompat; import android.util.AttributeSet; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.Surface; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/RatingManager.java b/src/org/thoughtcrime/securesms/components/RatingManager.java index e06cbb98a0..578640c7b7 100644 --- a/src/org/thoughtcrime/securesms/components/RatingManager.java +++ b/src/org/thoughtcrime/securesms/components/RatingManager.java @@ -7,7 +7,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; import android.support.v7.app.AlertDialog; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.widget.Toast; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java index 7841691d5b..b52b6d5c20 100644 --- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java +++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java @@ -6,7 +6,7 @@ import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.UiThread; import android.util.AttributeSet; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java b/src/org/thoughtcrime/securesms/components/ZoomingImageView.java index 094bfa02e6..0c5b735685 100644 --- a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java +++ b/src/org/thoughtcrime/securesms/components/ZoomingImageView.java @@ -7,7 +7,7 @@ import android.os.AsyncTask; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.AttributeSet; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import android.view.View; import android.widget.FrameLayout; diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java b/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java index 6686be4cc6..8899c36578 100644 --- a/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java +++ b/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java @@ -8,7 +8,7 @@ import android.hardware.Camera.Size; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.DisplayMetrics; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.Surface; import java.util.Collections; diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraView.java b/src/org/thoughtcrime/securesms/components/camera/CameraView.java index de84e3fbd0..f1ac17eef6 100644 --- a/src/org/thoughtcrime/securesms/components/camera/CameraView.java +++ b/src/org/thoughtcrime/securesms/components/camera/CameraView.java @@ -32,7 +32,7 @@ import android.os.Build.VERSION; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.AttributeSet; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.OrientationEventListener; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java b/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java index cc58be771c..398d9e7ab0 100644 --- a/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java +++ b/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java @@ -13,7 +13,6 @@ import android.support.v4.view.ViewCompat; import android.support.v4.view.animation.FastOutSlowInInterpolator; import android.support.v4.widget.ViewDragHelper; import android.util.AttributeSet; -import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.Surface; @@ -27,6 +26,7 @@ import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.InputAwareLayout.InputView; import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout; import org.thoughtcrime.securesms.components.camera.CameraView.CameraViewListener; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java index 3bf0f5a40b..80cb3b1c4f 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java @@ -6,7 +6,7 @@ import android.support.annotation.Nullable; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.util.AttributeSet; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java index 1291794ba9..b296346571 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java @@ -15,7 +15,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.Spannable; import android.text.SpannableStringBuilder; -import android.util.Log; import android.widget.TextView; import org.thoughtcrime.securesms.R; @@ -23,6 +22,7 @@ import org.thoughtcrime.securesms.components.emoji.parsing.EmojiDrawInfo; import org.thoughtcrime.securesms.components.emoji.parsing.EmojiPageBitmap; import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser; import org.thoughtcrime.securesms.components.emoji.parsing.EmojiTree; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.FutureTaskListener; import org.thoughtcrime.securesms.util.Util; import org.whispersystems.libsignal.util.Pair; diff --git a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java index 48620418e3..ea9cccdda0 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java +++ b/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java @@ -5,12 +5,12 @@ import android.content.SharedPreferences; import android.os.AsyncTask; import android.preference.PreferenceManager; import android.support.annotation.NonNull; -import android.util.Log; import com.fasterxml.jackson.databind.type.CollectionType; import com.fasterxml.jackson.databind.type.TypeFactory; import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.JsonUtils; import java.io.IOException; diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java index 36fe848fb0..2f96a2d21d 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java +++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.os.AsyncTask; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.engine.DiskCacheStrategy; diff --git a/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java b/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java index 753d8df71c..1e5cf2eb92 100644 --- a/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java +++ b/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java @@ -7,7 +7,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; import android.util.AttributeSet; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; @@ -15,7 +15,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.IdentityDatabase; import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord; import org.thoughtcrime.securesms.util.ViewUtil; diff --git a/src/org/thoughtcrime/securesms/components/location/SignalPlace.java b/src/org/thoughtcrime/securesms/components/location/SignalPlace.java index 3b8566cdfc..b5a2219ee0 100644 --- a/src/org/thoughtcrime/securesms/components/location/SignalPlace.java +++ b/src/org/thoughtcrime/securesms/components/location/SignalPlace.java @@ -4,13 +4,13 @@ import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.android.gms.location.places.Place; import com.google.android.gms.maps.model.LatLng; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.JsonUtils; import java.io.IOException; diff --git a/src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java b/src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java index 66ed65724c..ba8dce2bab 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.reminder; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.widget.Toast; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java b/src/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java index b1ec4ee318..f738b922f6 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java @@ -4,8 +4,8 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.util.Log; -import android.view.View; +import org.thoughtcrime.securesms.logging.Log; + import android.widget.Toast; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java b/src/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java index cf357f6f10..9faafc2e65 100644 --- a/src/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java +++ b/src/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java @@ -8,11 +8,11 @@ import android.graphics.BitmapRegionDecoder; import android.graphics.Point; import android.graphics.Rect; import android.net.Uri; -import android.util.Log; import com.davemorrissey.labs.subscaleview.decoder.ImageRegionDecoder; import com.davemorrissey.labs.subscaleview.decoder.SkiaImageRegionDecoder; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import java.io.InputStream; diff --git a/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java b/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java index dc44010413..5619a57394 100644 --- a/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java +++ b/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.components.viewpager; import android.content.Context; import android.support.v4.view.ViewPager; import android.util.AttributeSet; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.MotionEvent; /** diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java index af861c4f4d..48011e927c 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java @@ -25,7 +25,6 @@ import android.provider.ContactsContract; import android.support.annotation.NonNull; import android.support.v4.content.CursorLoader; import android.text.TextUtils; -import android.util.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.Address; @@ -34,6 +33,7 @@ import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.NumberUtil; diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java index 72d00c143f..207982a5d5 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java @@ -19,8 +19,6 @@ package org.thoughtcrime.securesms.contacts; import android.accounts.Account; import android.annotation.SuppressLint; import android.content.ContentProviderOperation; -import android.content.ContentProviderResult; -import android.content.ContentUris; import android.content.Context; import android.content.OperationApplicationException; import android.database.Cursor; @@ -34,12 +32,11 @@ import android.provider.ContactsContract.RawContacts; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; import android.util.Pair; -import org.thoughtcrime.securesms.ContactSelectionListFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.Address; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Util; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java b/src/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java index 09f71c123b..9c60a8a6e9 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java @@ -6,7 +6,7 @@ import android.content.ContentProviderClient; import android.content.Context; import android.content.SyncResult; import android.os.Bundle; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.DirectoryHelper; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/contactshare/Contact.java b/src/org/thoughtcrime/securesms/contactshare/Contact.java index 2cb1e2dc02..ec9028ba9b 100644 --- a/src/org/thoughtcrime/securesms/contactshare/Contact.java +++ b/src/org/thoughtcrime/securesms/contactshare/Contact.java @@ -6,14 +6,11 @@ import android.os.Parcelable; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.json.JSONException; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.attachments.UriAttachment; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java b/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java index c6ed522175..cdef7db39b 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java @@ -8,7 +8,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.WorkerThread; import android.text.TextUtils; -import android.util.Log; import org.thoughtcrime.securesms.contacts.ContactsDatabase; import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto; @@ -17,6 +16,7 @@ import org.thoughtcrime.securesms.contactshare.Contact.Name; import org.thoughtcrime.securesms.contactshare.Contact.Phone; import org.thoughtcrime.securesms.contactshare.Contact.PostalAddress; import org.thoughtcrime.securesms.database.Address; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.providers.PersistentBlobProvider; import org.thoughtcrime.securesms.recipients.Recipient; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java b/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java index 14426a1670..a70a02087c 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java @@ -11,7 +11,6 @@ import android.support.annotation.Nullable; import android.support.annotation.WorkerThread; import android.support.v7.app.AlertDialog; import android.text.TextUtils; -import android.util.Log; import com.annimon.stream.Stream; import com.google.i18n.phonenumbers.NumberParseException; @@ -24,6 +23,7 @@ import org.thoughtcrime.securesms.contactshare.Contact.Email; import org.thoughtcrime.securesms.contactshare.Contact.Phone; import org.thoughtcrime.securesms.contactshare.Contact.PostalAddress; import org.thoughtcrime.securesms.database.Address; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.SpanUtil; diff --git a/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java b/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java index 16befec961..585bf9952f 100644 --- a/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java +++ b/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java @@ -17,8 +17,8 @@ package org.thoughtcrime.securesms.crypto; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.LimitedInputStream; import org.thoughtcrime.securesms.util.Util; diff --git a/src/org/thoughtcrime/securesms/crypto/MasterCipher.java b/src/org/thoughtcrime/securesms/crypto/MasterCipher.java index 701f5c2b34..3198ed7c40 100644 --- a/src/org/thoughtcrime/securesms/crypto/MasterCipher.java +++ b/src/org/thoughtcrime/securesms/crypto/MasterCipher.java @@ -18,7 +18,7 @@ package org.thoughtcrime.securesms.crypto; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Hex; diff --git a/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java b/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java index a0f2cd4507..e82f3e2ce7 100644 --- a/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java +++ b/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java @@ -22,7 +22,7 @@ import android.content.SharedPreferences; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Util; diff --git a/src/org/thoughtcrime/securesms/crypto/PRNGFixes.java b/src/org/thoughtcrime/securesms/crypto/PRNGFixes.java index 3bdc0216c2..280e99631a 100644 --- a/src/org/thoughtcrime/securesms/crypto/PRNGFixes.java +++ b/src/org/thoughtcrime/securesms/crypto/PRNGFixes.java @@ -12,7 +12,7 @@ package org.thoughtcrime.securesms.crypto; import android.os.Build; import android.os.Process; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/src/org/thoughtcrime/securesms/crypto/PublicKey.java b/src/org/thoughtcrime/securesms/crypto/PublicKey.java index c94ca3cf7f..83138f2e30 100644 --- a/src/org/thoughtcrime/securesms/crypto/PublicKey.java +++ b/src/org/thoughtcrime/securesms/crypto/PublicKey.java @@ -17,8 +17,7 @@ */ package org.thoughtcrime.securesms.crypto; -import android.util.Log; - +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Hex; import org.thoughtcrime.securesms.util.Util; import org.whispersystems.libsignal.InvalidKeyException; diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java index be6736a40d..fedfbc0c19 100644 --- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java +++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.crypto.storage; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; import org.thoughtcrime.securesms.crypto.SessionUtil; diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java index 2f953806a7..882887ec57 100644 --- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java +++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java @@ -2,34 +2,18 @@ package org.thoughtcrime.securesms.crypto.storage; import android.content.Context; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.util.Log; -import org.thoughtcrime.securesms.crypto.MasterCipher; -import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.SessionDatabase; -import org.thoughtcrime.securesms.util.Conversions; -import org.whispersystems.libsignal.InvalidMessageException; +import org.thoughtcrime.securesms.logging.Log; import org.whispersystems.libsignal.SignalProtocolAddress; import org.whispersystems.libsignal.protocol.CiphertextMessage; import org.whispersystems.libsignal.state.SessionRecord; -import org.whispersystems.libsignal.state.SessionState; import org.whispersystems.libsignal.state.SessionStore; -import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; -import java.util.LinkedList; import java.util.List; -import static org.whispersystems.libsignal.state.StorageProtos.SessionStructure; - public class TextSecureSessionStore implements SessionStore { private static final String TAG = TextSecureSessionStore.class.getSimpleName(); diff --git a/src/org/thoughtcrime/securesms/database/Address.java b/src/org/thoughtcrime/securesms/database/Address.java index 56c6108282..9934b0ec41 100644 --- a/src/org/thoughtcrime/securesms/database/Address.java +++ b/src/org/thoughtcrime/securesms/database/Address.java @@ -8,7 +8,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; -import android.util.Log; import android.util.Pair; import com.google.i18n.phonenumbers.NumberParseException; @@ -16,6 +15,7 @@ import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.Phonenumber; import com.google.i18n.phonenumbers.ShortNumberInfo; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.DelimiterUtil; import org.thoughtcrime.securesms.util.GroupUtil; import org.thoughtcrime.securesms.util.NumberUtil; diff --git a/src/org/thoughtcrime/securesms/database/ApnDatabase.java b/src/org/thoughtcrime/securesms/database/ApnDatabase.java index ad069ea6b0..353b199fad 100644 --- a/src/org/thoughtcrime/securesms/database/ApnDatabase.java +++ b/src/org/thoughtcrime/securesms/database/ApnDatabase.java @@ -22,7 +22,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.LegacyMmsConnection.Apn; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java index 6230d5c24b..3adad6eabd 100644 --- a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java +++ b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java @@ -28,7 +28,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/EarlyReceiptCache.java b/src/org/thoughtcrime/securesms/database/EarlyReceiptCache.java index 94d7b79631..811d55ac03 100644 --- a/src/org/thoughtcrime/securesms/database/EarlyReceiptCache.java +++ b/src/org/thoughtcrime/securesms/database/EarlyReceiptCache.java @@ -1,7 +1,6 @@ package org.thoughtcrime.securesms.database; -import android.util.Log; - +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.LRUCache; import java.util.HashMap; diff --git a/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java b/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java index da1000743f..8b07bdbee5 100644 --- a/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java +++ b/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java @@ -5,9 +5,7 @@ import android.content.Context; import android.database.Cursor; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; -import android.util.Log; -import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/database/MessagingDatabase.java b/src/org/thoughtcrime/securesms/database/MessagingDatabase.java index 92531de358..660c5584c5 100644 --- a/src/org/thoughtcrime/securesms/database/MessagingDatabase.java +++ b/src/org/thoughtcrime/securesms/database/MessagingDatabase.java @@ -4,7 +4,6 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.text.TextUtils; -import android.util.Log; import net.sqlcipher.database.SQLiteDatabase; @@ -12,6 +11,7 @@ import org.thoughtcrime.securesms.database.documents.Document; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchList; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.JsonUtils; import org.whispersystems.libsignal.IdentityKey; diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java index 3e504fc5ac..7c8dcc0912 100644 --- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -23,7 +23,7 @@ import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java index ef23808197..1af0802915 100644 --- a/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java +++ b/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java @@ -20,7 +20,7 @@ import android.content.Context; import android.database.Cursor; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import net.sqlcipher.database.SQLiteDatabase; import net.sqlcipher.database.SQLiteQueryBuilder; diff --git a/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java b/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java index 6129f8eaef..327a15ef4a 100644 --- a/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java +++ b/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java @@ -5,7 +5,7 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/PushDatabase.java b/src/org/thoughtcrime/securesms/database/PushDatabase.java index 6d5fce2800..8bc17c7510 100644 --- a/src/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/src/org/thoughtcrime/securesms/database/PushDatabase.java @@ -4,7 +4,7 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/RecipientDatabase.java b/src/org/thoughtcrime/securesms/database/RecipientDatabase.java index 2ee6a381e2..3b1fd26f07 100644 --- a/src/org/thoughtcrime/securesms/database/RecipientDatabase.java +++ b/src/org/thoughtcrime/securesms/database/RecipientDatabase.java @@ -6,7 +6,7 @@ import android.database.Cursor; import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/database/SessionDatabase.java b/src/org/thoughtcrime/securesms/database/SessionDatabase.java index c269ff3431..27cbb85c33 100644 --- a/src/org/thoughtcrime/securesms/database/SessionDatabase.java +++ b/src/org/thoughtcrime/securesms/database/SessionDatabase.java @@ -6,11 +6,11 @@ import android.content.Context; import android.database.Cursor; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import net.sqlcipher.database.SQLiteDatabase; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; +import org.thoughtcrime.securesms.logging.Log; import org.whispersystems.libsignal.state.SessionRecord; import org.whispersystems.signalservice.api.push.SignalServiceAddress; diff --git a/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java b/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java index 6f5e9625be..c2529d8a7d 100644 --- a/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java +++ b/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java @@ -6,11 +6,11 @@ import android.content.Context; import android.database.Cursor; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import net.sqlcipher.database.SQLiteDatabase; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Base64; import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.libsignal.ecc.Curve; diff --git a/src/org/thoughtcrime/securesms/database/SmsDatabase.java b/src/org/thoughtcrime/securesms/database/SmsDatabase.java index e9611b7731..0fac077110 100644 --- a/src/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/src/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -22,7 +22,7 @@ import android.content.Context; import android.database.Cursor; import android.support.annotation.NonNull; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/database/SmsMigrator.java b/src/org/thoughtcrime/securesms/database/SmsMigrator.java index 8222dd82d0..4922df321f 100644 --- a/src/org/thoughtcrime/securesms/database/SmsMigrator.java +++ b/src/org/thoughtcrime/securesms/database/SmsMigrator.java @@ -21,11 +21,11 @@ import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.net.Uri; import android.support.annotation.Nullable; -import android.util.Log; import net.sqlcipher.database.SQLiteDatabase; import net.sqlcipher.database.SQLiteStatement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java index ee69117d56..981a58b46e 100644 --- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -24,7 +24,7 @@ import android.database.MergeCursor; import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java b/src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java index 0a85c64d59..effa90ea78 100644 --- a/src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java +++ b/src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.database.documents; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java index 070cb93583..f389b5d7a0 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java @@ -12,7 +12,7 @@ import android.net.Uri; import android.provider.ContactsContract; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.i18n.phonenumbers.NumberParseException; diff --git a/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java b/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java index 5ac68de43a..748e230f1a 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java @@ -4,7 +4,6 @@ package org.thoughtcrime.securesms.database.helpers; import android.content.ContentValues; import android.content.Context; import android.support.annotation.NonNull; -import android.util.Log; import com.fasterxml.jackson.annotation.JsonProperty; @@ -12,6 +11,7 @@ import net.sqlcipher.database.SQLiteDatabase; import org.thoughtcrime.securesms.database.OneTimePreKeyDatabase; import org.thoughtcrime.securesms.database.SignedPreKeyDatabase; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Conversions; import org.thoughtcrime.securesms.util.JsonUtils; diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java index 7d40bc53ac..a630510f03 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java @@ -7,7 +7,7 @@ import android.database.Cursor; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import com.annimon.stream.function.BiFunction; diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java index afcb8b4a99..9f8c3ba7cd 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java @@ -7,7 +7,7 @@ import android.database.Cursor; import android.os.SystemClock; import android.support.annotation.NonNull; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import net.sqlcipher.database.SQLiteDatabase; import net.sqlcipher.database.SQLiteDatabaseHook; diff --git a/src/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java index 6c725d5c95..8aeddc9190 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database.helpers; import android.content.ContentValues; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java b/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java index eb22b51c1d..e4e595a0c3 100644 --- a/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java +++ b/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.database.loaders; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.AsyncLoader; import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo; diff --git a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java index 208e372490..d3770a5ed6 100644 --- a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java +++ b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.dependencies; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.BuildConfig; @@ -34,7 +34,6 @@ import org.thoughtcrime.securesms.jobs.RetrieveProfileJob; import org.thoughtcrime.securesms.jobs.RotateSignedPreKeyJob; import org.thoughtcrime.securesms.jobs.SendReadReceiptJob; import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment; -import org.thoughtcrime.securesms.preferences.SmsMmsPreferenceFragment; import org.thoughtcrime.securesms.push.SecurityEventListener; import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess; import org.thoughtcrime.securesms.service.MessageRetrievalService; diff --git a/src/org/thoughtcrime/securesms/gcm/GcmBroadcastReceiver.java b/src/org/thoughtcrime/securesms/gcm/GcmBroadcastReceiver.java index 32c433b4f7..7d803de572 100644 --- a/src/org/thoughtcrime/securesms/gcm/GcmBroadcastReceiver.java +++ b/src/org/thoughtcrime/securesms/gcm/GcmBroadcastReceiver.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.support.v4.content.WakefulBroadcastReceiver; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.android.gms.gcm.GoogleCloudMessaging; diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java b/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java index 383259d7a7..49a1933888 100644 --- a/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java +++ b/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java @@ -6,7 +6,7 @@ import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.giph.model.GiphyImage; diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyProxySelector.java b/src/org/thoughtcrime/securesms/giph/net/GiphyProxySelector.java index 9487fc3b9e..24c8ca47be 100644 --- a/src/org/thoughtcrime/securesms/giph/net/GiphyProxySelector.java +++ b/src/org/thoughtcrime/securesms/giph/net/GiphyProxySelector.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.giph.net; import android.os.AsyncTask; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.util.Util; diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java index f056fbdddc..c8936e575b 100644 --- a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java +++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java @@ -14,7 +14,7 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.view.ViewPager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.View; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java index 938187fe9d..602f8fdb66 100644 --- a/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java +++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java @@ -7,7 +7,7 @@ import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.widget.RecyclerView; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,8 +18,6 @@ import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.load.resource.gif.GifDrawable; -import com.bumptech.glide.load.resource.gif.GifDrawableEncoder; -import com.bumptech.glide.load.resource.gif.GifDrawableResource; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.util.ByteBufferUtil; @@ -33,12 +31,6 @@ import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.Channels; -import java.nio.channels.WritableByteChannel; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/src/org/thoughtcrime/securesms/glide/GiphyPaddedUrlFetcher.java b/src/org/thoughtcrime/securesms/glide/GiphyPaddedUrlFetcher.java index a1706d4141..7112dfce3f 100644 --- a/src/org/thoughtcrime/securesms/glide/GiphyPaddedUrlFetcher.java +++ b/src/org/thoughtcrime/securesms/glide/GiphyPaddedUrlFetcher.java @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.glide; import android.support.annotation.NonNull; -import android.util.Log; import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; @@ -10,6 +9,7 @@ import com.bumptech.glide.load.data.DataFetcher; import com.bumptech.glide.util.ContentLengthInputStream; import org.thoughtcrime.securesms.giph.model.GiphyPaddedUrl; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Util; import java.io.FilterInputStream; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java index 362bb7a5a8..8f3dba4005 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.glide.cache; import android.graphics.Bitmap; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.ResourceDecoder; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java index 104bd4e55a..7ca8ae9d15 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.glide.cache; import android.graphics.Bitmap; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.EncodeStrategy; import com.bumptech.glide.load.Options; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java index b98f71ac73..f966087ec1 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java @@ -2,12 +2,13 @@ package org.thoughtcrime.securesms.glide.cache; import android.support.annotation.NonNull; -import android.util.Log; import com.bumptech.glide.load.Encoder; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.engine.bitmap_recycle.ArrayPool; +import org.thoughtcrime.securesms.logging.Log; + import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java index 03ea73817c..09990daaa3 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.glide.cache; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.ResourceDecoder; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java index 5a72de5a59..24d1bb76b5 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.glide.cache; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.EncodeStrategy; import com.bumptech.glide.load.Options; diff --git a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java index cbb4b9e59f..bcf2129b6f 100644 --- a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java +++ b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.groups; import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.protobuf.ByteString; diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobConsumer.java b/src/org/thoughtcrime/securesms/jobmanager/JobConsumer.java index 7955f3bb18..cbdb43be9e 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/JobConsumer.java +++ b/src/org/thoughtcrime/securesms/jobmanager/JobConsumer.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.jobmanager; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.jobmanager.persistence.PersistentStorage; diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java b/src/org/thoughtcrime/securesms/jobmanager/JobManager.java index f8932c9155..c41956581f 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java +++ b/src/org/thoughtcrime/securesms/jobmanager/JobManager.java @@ -18,7 +18,6 @@ package org.thoughtcrime.securesms.jobmanager; import android.content.Context; import android.os.PowerManager; -import android.util.Log; import org.thoughtcrime.securesms.jobmanager.dependencies.AggregateDependencyInjector; import org.thoughtcrime.securesms.jobmanager.dependencies.DependencyInjector; @@ -26,6 +25,7 @@ import org.thoughtcrime.securesms.jobmanager.persistence.JobSerializer; import org.thoughtcrime.securesms.jobmanager.persistence.PersistentStorage; import org.thoughtcrime.securesms.jobmanager.requirements.RequirementListener; import org.thoughtcrime.securesms.jobmanager.requirements.RequirementProvider; +import org.thoughtcrime.securesms.logging.Log; import java.io.IOException; import java.util.Arrays; diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/PersistentStorage.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/PersistentStorage.java index 29b6044853..7bd9ed6904 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/persistence/PersistentStorage.java +++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/PersistentStorage.java @@ -21,11 +21,11 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; import org.thoughtcrime.securesms.jobmanager.EncryptionKeys; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.dependencies.AggregateDependencyInjector; +import org.thoughtcrime.securesms.logging.Log; import java.io.IOException; import java.util.LinkedList; diff --git a/src/org/thoughtcrime/securesms/jobmanager/requirements/BackoffReceiver.java b/src/org/thoughtcrime/securesms/jobmanager/requirements/BackoffReceiver.java index 35a10cd9d5..203c93aeb7 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/requirements/BackoffReceiver.java +++ b/src/org/thoughtcrime/securesms/jobmanager/requirements/BackoffReceiver.java @@ -6,10 +6,10 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.support.annotation.NonNull; -import android.util.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.BuildConfig; +import org.thoughtcrime.securesms.logging.Log; import java.util.UUID; diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java index 5f40dc409b..905168dcb4 100644 --- a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.attachments.Attachment; diff --git a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index 41b9411fa4..273107f007 100644 --- a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.graphics.Bitmap; import android.support.annotation.NonNull; -import android.util.Log; import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.database.DatabaseFactory; @@ -13,6 +12,7 @@ import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel; import org.thoughtcrime.securesms.util.BitmapDecodingException; import org.thoughtcrime.securesms.util.BitmapUtil; diff --git a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java index 11a70df708..d5922c030a 100644 --- a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java +++ b/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.PreKeyUtil; diff --git a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java index 9d19fa7931..153564872b 100644 --- a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java +++ b/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java @@ -1,7 +1,6 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; import org.thoughtcrime.securesms.crypto.MasterSecret; @@ -10,6 +9,7 @@ import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.libsignal.IdentityKeyPair; import org.whispersystems.libsignal.state.SignedPreKeyRecord; diff --git a/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java b/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java index 0bf788e74c..601efc745b 100644 --- a/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java +++ b/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java @@ -4,7 +4,7 @@ import android.content.Context; import android.os.PowerManager; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; diff --git a/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java b/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java index d0d7dedcf9..f27351e9e1 100644 --- a/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java +++ b/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java @@ -22,7 +22,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.BitmapFactory; import android.support.v4.app.NotificationCompat; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; diff --git a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java index b67b23fc01..29dc6b56d8 100644 --- a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java +++ b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.jobs; import android.Manifest; import android.content.Context; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.backup.FullBackupExporter; diff --git a/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java index a1314be8da..40b40aba27 100644 --- a/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.net.Uri; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.android.mms.pdu_alt.CharacterSets; import com.google.android.mms.pdu_alt.EncodedStringValue; diff --git a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java index a5ea75b984..4e74fa65a5 100644 --- a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import com.google.android.mms.pdu_alt.GenericPdu; diff --git a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java index 8e561be02e..32e4ab0f1f 100644 --- a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.webkit.MimeTypeMap; import com.android.mms.dom.smil.parser.SmilXmlSerializer; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java index 589139196b..a16410f5ce 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java @@ -9,7 +9,6 @@ import android.os.Build; import android.provider.ContactsContract; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.contacts.ContactAccessor; @@ -23,6 +22,7 @@ import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java index 0dca950b5b..460443fe85 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.support.annotation.Nullable; -import android.util.Log; import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.database.Address; @@ -10,6 +9,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.GroupUtil; import org.thoughtcrime.securesms.jobmanager.JobParameters; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java index fe1cd2693f..897c9131d4 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadReceiptUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadReceiptUpdateJob.java index c76e7d089b..e5bf04ce63 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadReceiptUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadReceiptUpdateJob.java @@ -2,11 +2,11 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java index 92e6eb5bbe..764817b671 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java index 33e661a358..aaf4a687e2 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus; diff --git a/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java index b7419ac93a..393a77798b 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java index 94d7891465..29ae88d662 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java @@ -7,7 +7,7 @@ import android.os.Build; import android.support.annotation.NonNull; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationManagerCompat; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import org.thoughtcrime.securesms.ApplicationContext; diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java index 12abcc7650..3dccc7809b 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java @@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import com.annimon.stream.Stream; @@ -18,8 +17,8 @@ import org.thoughtcrime.securesms.database.documents.NetworkFailure; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkBackoffRequirement; -import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.MediaConstraints; import org.thoughtcrime.securesms.mms.MmsException; import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage; diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java index a197baf1a1..097f171427 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java index 51ed31232f..d33de03be7 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.attachments.Attachment; @@ -28,7 +28,6 @@ import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserExce import java.io.FileNotFoundException; import java.io.IOException; -import java.util.Collections; import java.util.List; import javax.inject.Inject; diff --git a/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java index 43a416e0f1..87b301462f 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java @@ -1,11 +1,11 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.whispersystems.signalservice.api.SignalServiceMessageReceiver; import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope; import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; diff --git a/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java b/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java index 202f86120d..c7a06aaf38 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.support.annotation.NonNull; -import android.util.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.Address; @@ -11,6 +10,7 @@ import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.jobmanager.JobManager; import org.thoughtcrime.securesms.jobmanager.JobParameters; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.recipients.Recipient; import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope; diff --git a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java index 8cca4dd4e1..5eb48179ac 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.support.annotation.NonNull; -import android.util.Log; import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.ApplicationContext; @@ -18,6 +17,7 @@ import org.thoughtcrime.securesms.events.PartProgressEvent; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkBackoffRequirement; import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader; import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; import org.thoughtcrime.securesms.mms.PartAuthority; diff --git a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java index 58b3967c43..20faeab2a1 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java index f1d07fa18a..7227e5c81b 100644 --- a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.JobParameters; diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java index 68aabe71b4..94c23b19b4 100644 --- a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java @@ -1,7 +1,6 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; @@ -11,6 +10,7 @@ import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.libsignal.IdentityKeyPair; import org.whispersystems.libsignal.state.PreKeyRecord; diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index 3b47b517d8..5ef2c7d1e9 100644 --- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.RecipientDatabase; diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java index 0e0c9f75d6..96b6f26962 100644 --- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.support.annotation.NonNull; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java b/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java index 54dbf9a243..43a1d48a1a 100644 --- a/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; @@ -12,6 +11,7 @@ import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.libsignal.IdentityKeyPair; import org.whispersystems.libsignal.state.SignedPreKeyRecord; diff --git a/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java index 024d89117b..41333b2339 100644 --- a/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java @@ -2,12 +2,12 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; diff --git a/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java b/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java index bf24efe932..a22be361a1 100644 --- a/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java +++ b/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java @@ -1,13 +1,13 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.events.ReminderUpdateEvent; import org.thoughtcrime.securesms.jobmanager.JobParameters; import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.transport.RetryLaterException; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java index fa0ed108e0..efa00ceb27 100644 --- a/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java +++ b/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java @@ -4,7 +4,7 @@ import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.telephony.SmsMessage; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult; diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java index a2ba460b92..b6d5dfd91a 100644 --- a/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java @@ -7,7 +7,7 @@ import android.net.Uri; import android.os.Build; import android.telephony.PhoneNumberUtils; import android.telephony.SmsManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java b/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java index 1d26dcdc43..abec37c183 100644 --- a/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java +++ b/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobs; import android.app.Activity; import android.content.Context; import android.telephony.SmsManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.crypto.MasterSecret; diff --git a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java index 634d0e63bb..15c843ed3b 100644 --- a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java @@ -17,11 +17,11 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.util.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.JobParameters; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.TextSecurePreferences; public class TrimThreadJob extends Job { diff --git a/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java b/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java index 63d55e4481..5f723670e5 100644 --- a/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java +++ b/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java @@ -10,7 +10,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.Build; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java b/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java index 51100fa928..2d5ef85c36 100644 --- a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java +++ b/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java @@ -2,9 +2,7 @@ package org.thoughtcrime.securesms.lock; import android.annotation.SuppressLint; -import android.app.Activity; import android.content.Context; -import android.content.DialogInterface; import android.graphics.Typeface; import android.os.AsyncTask; import android.os.Build; @@ -19,7 +17,7 @@ import android.text.method.LinkMovementMethod; import android.text.style.ClickableSpan; import android.text.style.StyleSpan; import android.util.DisplayMetrics; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.Display; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java b/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java index 5ec41336a3..ee53c0ab60 100644 --- a/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java +++ b/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java @@ -36,7 +36,6 @@ import android.text.ClipboardManager; import android.text.TextUtils; import android.text.method.LinkMovementMethod; import android.text.util.Linkify; -import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; @@ -50,6 +49,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logsubmit.util.Scrubber; import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask; @@ -322,7 +322,7 @@ public class SubmitLogFragment extends Fragment { try { newLogs = scrubber.scrub(ApplicationContext.getInstance(context).getPersistentLogger().getLogs().get()); } catch (InterruptedException | ExecutionException e) { - android.util.Log.w(TAG, "Failed to retrieve new logs.", e); + Log.w(TAG, "Failed to retrieve new logs.", e); newLogs = "Failed to retrieve logs."; } diff --git a/src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java b/src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java index fd1e7a5d42..e0a1ac118e 100644 --- a/src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java +++ b/src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.logsubmit.util; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java index f2adfd29a6..7d70553fe6 100644 --- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -34,7 +34,7 @@ import android.provider.OpenableColumns; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import android.view.View; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java index 17cd246ab7..8475761428 100644 --- a/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java +++ b/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mms; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; diff --git a/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java b/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java index 64f36f59cc..12a0771eba 100644 --- a/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java @@ -1,12 +1,11 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; -import android.os.Build; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.android.mms.pdu_alt.PduHeaders; import com.google.android.mms.pdu_alt.RetrieveConf; diff --git a/src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java b/src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java index faa131b8f6..2b11974a67 100644 --- a/src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java +++ b/src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java @@ -4,11 +4,10 @@ import android.content.ContentResolver; import android.content.Context; import android.graphics.Bitmap; import android.net.Uri; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.data.StreamLocalUriFetcher; -import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.util.MediaUtil; import java.io.ByteArrayInputStream; diff --git a/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java b/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java index b184ce360e..00f86f45df 100644 --- a/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java @@ -20,7 +20,7 @@ import android.content.Context; import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.android.mms.InvalidHeaderValueException; import com.google.android.mms.pdu_alt.NotifyRespInd; diff --git a/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java b/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java index 8891836ee0..8b3bc4e983 100644 --- a/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java @@ -24,7 +24,7 @@ import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.telephony.SmsManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.android.mms.InvalidHeaderValueException; import com.google.android.mms.pdu_alt.NotifyRespInd; diff --git a/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java b/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java index d65f3a34c8..319da0844f 100644 --- a/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java @@ -20,7 +20,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.apache.http.Header; import org.apache.http.auth.AuthScope; diff --git a/src/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java b/src/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java index d38b6ae142..9324ecccd7 100644 --- a/src/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java @@ -21,8 +21,8 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Util; import java.util.concurrent.TimeoutException; diff --git a/src/org/thoughtcrime/securesms/mms/MediaConstraints.java b/src/org/thoughtcrime/securesms/mms/MediaConstraints.java index 75717d96e7..edf0cb01ca 100644 --- a/src/org/thoughtcrime/securesms/mms/MediaConstraints.java +++ b/src/org/thoughtcrime/securesms/mms/MediaConstraints.java @@ -4,11 +4,10 @@ import android.content.Context; import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri; import org.thoughtcrime.securesms.util.BitmapDecodingException; import org.thoughtcrime.securesms.util.BitmapUtil; diff --git a/src/org/thoughtcrime/securesms/mms/MmsRadio.java b/src/org/thoughtcrime/securesms/mms/MmsRadio.java index 5f61ad8226..80380c4f7d 100644 --- a/src/org/thoughtcrime/securesms/mms/MmsRadio.java +++ b/src/org/thoughtcrime/securesms/mms/MmsRadio.java @@ -7,7 +7,7 @@ import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.PowerManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Util; diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java b/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java index 4d9f364585..f68e9ffe6f 100644 --- a/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java @@ -22,7 +22,7 @@ import android.net.NetworkInfo; import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.android.mms.pdu_alt.PduParser; import com.google.android.mms.pdu_alt.SendConf; diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java b/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java index 7876962d51..512a99ed5e 100644 --- a/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java @@ -25,7 +25,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.telephony.SmsManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.android.mms.service_alt.MmsConfig; import com.google.android.mms.pdu_alt.PduParser; diff --git a/src/org/thoughtcrime/securesms/mms/PartParser.java b/src/org/thoughtcrime/securesms/mms/PartParser.java index 7c7e44a171..39806d234a 100644 --- a/src/org/thoughtcrime/securesms/mms/PartParser.java +++ b/src/org/thoughtcrime/securesms/mms/PartParser.java @@ -1,12 +1,11 @@ package org.thoughtcrime.securesms.mms; -import android.util.Log; - import com.google.android.mms.ContentType; import com.google.android.mms.pdu_alt.CharacterSets; import com.google.android.mms.pdu_alt.PduBody; import com.google.android.mms.pdu_alt.PduPart; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Util; import java.io.UnsupportedEncodingException; diff --git a/src/org/thoughtcrime/securesms/mms/QuoteId.java b/src/org/thoughtcrime/securesms/mms/QuoteId.java index 7cfa56a03a..b5158e172d 100644 --- a/src/org/thoughtcrime/securesms/mms/QuoteId.java +++ b/src/org/thoughtcrime/securesms/mms/QuoteId.java @@ -2,12 +2,12 @@ package org.thoughtcrime.securesms.mms; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import org.json.JSONException; import org.json.JSONObject; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.model.MessageRecord; +import org.thoughtcrime.securesms.logging.Log; /** * Represents the information required to find the {@link MessageRecord} pointed to by a quote. diff --git a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java b/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java index 888e39c3b1..3584823893 100644 --- a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java +++ b/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java @@ -48,7 +48,7 @@ public class SignalGlideModule extends AppGlideModule { @Override public void applyOptions(Context context, GlideBuilder builder) { - builder.setLogLevel(Log.ERROR); + builder.setLogLevel(Log.INFO); // builder.setDiskCache(new NoopDiskCacheFactory()); } diff --git a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java index 8b75342dab..bd7e24c16d 100644 --- a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java @@ -9,7 +9,6 @@ import android.support.annotation.Nullable; import android.support.v4.app.NotificationCompat; import android.text.SpannableStringBuilder; import android.text.TextUtils; -import android.util.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.RecipientDatabase; diff --git a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java index 651bb5f42b..f8cc3fe3a0 100644 --- a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java +++ b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java @@ -7,7 +7,6 @@ import android.content.Intent; import android.os.AsyncTask; import android.support.annotation.NonNull; import android.support.v4.app.NotificationManagerCompat; -import android.util.Log; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; @@ -20,6 +19,7 @@ import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId; import org.thoughtcrime.securesms.jobs.MultiDeviceReadUpdateJob; import org.thoughtcrime.securesms.jobs.SendReadReceiptJob; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.service.ExpiringMessageManager; import java.util.LinkedList; diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java index 7d334cfc41..44db38086d 100644 --- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java @@ -35,7 +35,7 @@ import android.service.notification.StatusBarNotification; import android.support.annotation.NonNull; import android.support.v4.app.NotificationManagerCompat; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.ConversationActivity; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationState.java b/src/org/thoughtcrime/securesms/notifications/NotificationState.java index 3595545f08..ba2168d901 100644 --- a/src/org/thoughtcrime/securesms/notifications/NotificationState.java +++ b/src/org/thoughtcrime/securesms/notifications/NotificationState.java @@ -6,11 +6,11 @@ import android.content.Intent; import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import org.thoughtcrime.securesms.ConversationActivity; import org.thoughtcrime.securesms.ConversationPopupActivity; import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.recipients.Recipient; import java.util.LinkedHashSet; diff --git a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java index 83ea03de5c..a3f889d941 100644 --- a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java @@ -13,7 +13,7 @@ import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat.Action; import android.support.v4.app.RemoteInput; import android.text.SpannableStringBuilder; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.engine.DiskCacheStrategy; @@ -22,7 +22,6 @@ import org.thoughtcrime.securesms.contacts.avatars.ContactColors; import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto; import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto; import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto; -import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.Slide; diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index 812e38b227..cae3e32d8d 100644 --- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -14,7 +14,7 @@ import android.support.annotation.Nullable; import android.support.v7.app.AlertDialog; import android.support.v7.preference.CheckBoxPreference; import android.support.v7.preference.Preference; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.widget.Toast; import com.google.android.gms.gcm.GoogleCloudMessaging; diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java index cadeda5272..1a4209ae85 100644 --- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java @@ -12,7 +12,6 @@ import android.support.v7.preference.EditTextPreference; import android.support.v7.preference.ListPreference; import android.support.v7.preference.Preference; import android.text.TextUtils; -import android.util.Log; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -21,10 +20,10 @@ import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.ApplicationPreferencesActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.backup.BackupDialog; -import org.thoughtcrime.securesms.backup.FullBackupBase; import org.thoughtcrime.securesms.backup.FullBackupBase.BackupEvent; import org.thoughtcrime.securesms.components.SwitchPreferenceCompat; import org.thoughtcrime.securesms.jobs.LocalBackupJob; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.preferences.widgets.ProgressPreference; import org.thoughtcrime.securesms.util.BackupUtil; diff --git a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java index 30169f30c0..e93beff2d3 100644 --- a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java @@ -20,12 +20,12 @@ import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; import android.support.annotation.Nullable; -import android.util.Log; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.CustomDefaultPreference; import org.thoughtcrime.securesms.database.ApnDatabase; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.LegacyMmsConnection; import org.thoughtcrime.securesms.util.TelephonyUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java b/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java index 781465ee75..1e4c08c534 100644 --- a/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java +++ b/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java @@ -13,7 +13,7 @@ import android.provider.ContactsContract; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.MediaConstraints; import org.thoughtcrime.securesms.util.BitmapDecodingException; diff --git a/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java b/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java index 8011a6705f..3f1175549f 100644 --- a/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java +++ b/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java @@ -24,7 +24,7 @@ import android.content.UriMatcher; import android.database.Cursor; import android.net.Uri; import android.os.ParcelFileDescriptor; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/org/thoughtcrime/securesms/providers/PartProvider.java b/src/org/thoughtcrime/securesms/providers/PartProvider.java index a0410dd271..5750b33dc1 100644 --- a/src/org/thoughtcrime/securesms/providers/PartProvider.java +++ b/src/org/thoughtcrime/securesms/providers/PartProvider.java @@ -27,7 +27,7 @@ import android.os.MemoryFile; import android.os.ParcelFileDescriptor; import android.provider.OpenableColumns; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; diff --git a/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java b/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java index 1d5cb8441f..0c5f57b440 100644 --- a/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java +++ b/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java @@ -7,7 +7,7 @@ import android.content.UriMatcher; import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import android.webkit.MimeTypeMap; diff --git a/src/org/thoughtcrime/securesms/push/AccountManagerFactory.java b/src/org/thoughtcrime/securesms/push/AccountManagerFactory.java index 4de17e9bec..a058f8e6f2 100644 --- a/src/org/thoughtcrime/securesms/push/AccountManagerFactory.java +++ b/src/org/thoughtcrime/securesms/push/AccountManagerFactory.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.push; import android.content.Context; import android.os.AsyncTask; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.android.gms.security.ProviderInstaller; diff --git a/src/org/thoughtcrime/securesms/qr/QrCode.java b/src/org/thoughtcrime/securesms/qr/QrCode.java index e6d2b5dc11..691d7fec1f 100644 --- a/src/org/thoughtcrime/securesms/qr/QrCode.java +++ b/src/org/thoughtcrime/securesms/qr/QrCode.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.qr; import android.graphics.Bitmap; import android.graphics.Color; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.zxing.BarcodeFormat; import com.google.zxing.WriterException; diff --git a/src/org/thoughtcrime/securesms/qr/ScanningThread.java b/src/org/thoughtcrime/securesms/qr/ScanningThread.java index f37374e296..0b38a6afeb 100644 --- a/src/org/thoughtcrime/securesms/qr/ScanningThread.java +++ b/src/org/thoughtcrime/securesms/qr/ScanningThread.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.qr; import android.content.res.Configuration; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.zxing.BinaryBitmap; import com.google.zxing.ChecksumException; diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java index f56221b725..e18f97b7bb 100644 --- a/src/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java @@ -23,7 +23,6 @@ import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; import com.annimon.stream.function.Consumer; @@ -43,6 +42,7 @@ import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase.RecipientSettings; import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState; import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.recipients.RecipientProvider.RecipientDetails; import org.thoughtcrime.securesms.util.FutureTaskListener; import org.thoughtcrime.securesms.util.ListenableFutureTask; diff --git a/src/org/thoughtcrime/securesms/scribbles/ScribbleActivity.java b/src/org/thoughtcrime/securesms/scribbles/ScribbleActivity.java index 4004ef4d6d..fdaee20644 100644 --- a/src/org/thoughtcrime/securesms/scribbles/ScribbleActivity.java +++ b/src/org/thoughtcrime/securesms/scribbles/ScribbleActivity.java @@ -12,7 +12,7 @@ import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.view.View; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java b/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java index 213e618389..664183b0e2 100644 --- a/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java +++ b/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java @@ -19,7 +19,7 @@ package org.thoughtcrime.securesms.scribbles; import android.content.Context; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.AsyncLoader; diff --git a/src/org/thoughtcrime/securesms/scribbles/multitouch/TwoFingerGestureDetector.java b/src/org/thoughtcrime/securesms/scribbles/multitouch/TwoFingerGestureDetector.java index ef94a9e63c..dfbec8def0 100644 --- a/src/org/thoughtcrime/securesms/scribbles/multitouch/TwoFingerGestureDetector.java +++ b/src/org/thoughtcrime/securesms/scribbles/multitouch/TwoFingerGestureDetector.java @@ -2,10 +2,11 @@ package org.thoughtcrime.securesms.scribbles.multitouch; import android.content.Context; import android.util.DisplayMetrics; -import android.util.Log; import android.view.MotionEvent; import android.view.ViewConfiguration; +import org.thoughtcrime.securesms.logging.Log; + /** * @author Almer Thie (code.almeros.com) * Copyright (c) 2013, Almer Thie (code.almeros.com) diff --git a/src/org/thoughtcrime/securesms/scribbles/viewmodel/Layer.java b/src/org/thoughtcrime/securesms/scribbles/viewmodel/Layer.java index 3b49bd8524..ed15d2ccd4 100644 --- a/src/org/thoughtcrime/securesms/scribbles/viewmodel/Layer.java +++ b/src/org/thoughtcrime/securesms/scribbles/viewmodel/Layer.java @@ -23,7 +23,7 @@ package org.thoughtcrime.securesms.scribbles.viewmodel; import android.support.annotation.FloatRange; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; public class Layer { diff --git a/src/org/thoughtcrime/securesms/scribbles/viewmodel/TextLayer.java b/src/org/thoughtcrime/securesms/scribbles/viewmodel/TextLayer.java index efe95c4379..4d9e77a3bd 100644 --- a/src/org/thoughtcrime/securesms/scribbles/viewmodel/TextLayer.java +++ b/src/org/thoughtcrime/securesms/scribbles/viewmodel/TextLayer.java @@ -22,8 +22,6 @@ package org.thoughtcrime.securesms.scribbles.viewmodel; -import android.util.Log; - public class TextLayer extends Layer { private String text; diff --git a/src/org/thoughtcrime/securesms/scribbles/widget/MotionView.java b/src/org/thoughtcrime/securesms/scribbles/widget/MotionView.java index 28420bc937..1fe3731049 100644 --- a/src/org/thoughtcrime/securesms/scribbles/widget/MotionView.java +++ b/src/org/thoughtcrime/securesms/scribbles/widget/MotionView.java @@ -39,7 +39,6 @@ import android.text.Selection; import android.text.TextUtils; import android.text.TextWatcher; import android.util.AttributeSet; -import android.util.Log; import android.util.TypedValue; import android.view.GestureDetector; import android.view.Gravity; @@ -51,6 +50,7 @@ import android.widget.EditText; import android.widget.FrameLayout; import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.scribbles.multitouch.MoveGestureDetector; import org.thoughtcrime.securesms.scribbles.multitouch.RotateGestureDetector; import org.thoughtcrime.securesms.scribbles.widget.entity.MotionEntity; diff --git a/src/org/thoughtcrime/securesms/service/DirectShareService.java b/src/org/thoughtcrime/securesms/service/DirectShareService.java index e4b9bbfee3..44e6a0421c 100644 --- a/src/org/thoughtcrime/securesms/service/DirectShareService.java +++ b/src/org/thoughtcrime/securesms/service/DirectShareService.java @@ -13,12 +13,12 @@ import android.service.chooser.ChooserTarget; import android.service.chooser.ChooserTargetService; import android.support.annotation.NonNull; import android.support.annotation.RequiresApi; -import android.util.Log; import org.thoughtcrime.securesms.ShareActivity; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.BitmapUtil; diff --git a/src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java index b43cf0e7d1..ab0c01f876 100644 --- a/src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java +++ b/src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.service; import android.content.Context; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MmsDatabase; diff --git a/src/org/thoughtcrime/securesms/service/KeyCachingService.java b/src/org/thoughtcrime/securesms/service/KeyCachingService.java index 78d0e56a8e..c023d63410 100644 --- a/src/org/thoughtcrime/securesms/service/KeyCachingService.java +++ b/src/org/thoughtcrime/securesms/service/KeyCachingService.java @@ -31,7 +31,7 @@ import android.os.IBinder; import android.os.SystemClock; import android.support.annotation.Nullable; import android.support.v4.app.NotificationCompat; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.widget.RemoteViews; import org.thoughtcrime.securesms.ConversationListActivity; diff --git a/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java b/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java index cb93e5b99a..2375cb7519 100644 --- a/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java +++ b/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.os.IBinder; import android.support.annotation.Nullable; import android.support.v4.app.NotificationCompat; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/service/MmsListener.java b/src/org/thoughtcrime/securesms/service/MmsListener.java index 3d8417d809..44454704ba 100644 --- a/src/org/thoughtcrime/securesms/service/MmsListener.java +++ b/src/org/thoughtcrime/securesms/service/MmsListener.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.Intent; import android.os.Build; import android.provider.Telephony; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.jobs.MmsReceiveJob; diff --git a/src/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java b/src/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java index f592d9f988..a0be1cd87a 100644 --- a/src/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java +++ b/src/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java @@ -6,7 +6,7 @@ import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; public abstract class PersistentAlarmManagerListener extends BroadcastReceiver { diff --git a/src/org/thoughtcrime/securesms/service/QuickResponseService.java b/src/org/thoughtcrime/securesms/service/QuickResponseService.java index 79029413e3..96f61d5c0f 100644 --- a/src/org/thoughtcrime/securesms/service/QuickResponseService.java +++ b/src/org/thoughtcrime/securesms/service/QuickResponseService.java @@ -4,11 +4,11 @@ import android.app.IntentService; import android.content.Intent; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.util.Log; import android.widget.Toast; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.Address; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.sms.MessageSender; import org.thoughtcrime.securesms.sms.OutgoingTextMessage; diff --git a/src/org/thoughtcrime/securesms/service/SmsDeliveryListener.java b/src/org/thoughtcrime/securesms/service/SmsDeliveryListener.java index a579f62366..901ebac0e8 100644 --- a/src/org/thoughtcrime/securesms/service/SmsDeliveryListener.java +++ b/src/org/thoughtcrime/securesms/service/SmsDeliveryListener.java @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.telephony.SmsMessage; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.SmsDatabase; diff --git a/src/org/thoughtcrime/securesms/service/SmsListener.java b/src/org/thoughtcrime/securesms/service/SmsListener.java index b2535f282e..71a641a8d5 100644 --- a/src/org/thoughtcrime/securesms/service/SmsListener.java +++ b/src/org/thoughtcrime/securesms/service/SmsListener.java @@ -26,7 +26,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.telephony.SmsMessage; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.RegistrationActivity; diff --git a/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java index 27a0cd3044..9e41f6f0ef 100644 --- a/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java +++ b/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java @@ -11,7 +11,7 @@ import android.database.Cursor; import android.net.Uri; import android.support.annotation.Nullable; import android.support.v4.app.NotificationCompat; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.util.FileProviderUtil; diff --git a/src/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java b/src/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java index e352afbdef..f0e87de064 100644 --- a/src/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java +++ b/src/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.service; import android.content.Context; import android.content.Intent; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.BuildConfig; diff --git a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java index 243b9cc545..f37c6939aa 100644 --- a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java +++ b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java @@ -19,7 +19,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.WorkerThread; import android.telephony.TelephonyManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import com.google.protobuf.InvalidProtocolBufferException; @@ -66,9 +66,7 @@ import org.webrtc.PeerConnection; import org.webrtc.PeerConnectionFactory; import org.webrtc.RtpReceiver; import org.webrtc.SessionDescription; -import org.webrtc.SurfaceEglRenderer; import org.webrtc.SurfaceViewRenderer; -import org.webrtc.VideoRenderer; import org.webrtc.VideoTrack; import org.whispersystems.libsignal.IdentityKey; import org.whispersystems.signalservice.api.SignalServiceAccountManager; diff --git a/src/org/thoughtcrime/securesms/sms/MessageSender.java b/src/org/thoughtcrime/securesms/sms/MessageSender.java index bf769fe53e..349717481d 100644 --- a/src/org/thoughtcrime/securesms/sms/MessageSender.java +++ b/src/org/thoughtcrime/securesms/sms/MessageSender.java @@ -17,9 +17,8 @@ package org.thoughtcrime.securesms.sms; import android.content.Context; -import android.database.Cursor; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import org.thoughtcrime.securesms.ApplicationContext; diff --git a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java index 5755782441..61d43ebbc5 100644 --- a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java +++ b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java @@ -9,9 +9,8 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.WorkerThread; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; -import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/util/BackupUtil.java b/src/org/thoughtcrime/securesms/util/BackupUtil.java index e21ff81a21..f1a6a2c7be 100644 --- a/src/org/thoughtcrime/securesms/util/BackupUtil.java +++ b/src/org/thoughtcrime/securesms/util/BackupUtil.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.NoExternalStorageException; diff --git a/src/org/thoughtcrime/securesms/util/BitmapUtil.java b/src/org/thoughtcrime/securesms/util/BitmapUtil.java index 506768df83..b0791e3eb1 100644 --- a/src/org/thoughtcrime/securesms/util/BitmapUtil.java +++ b/src/org/thoughtcrime/securesms/util/BitmapUtil.java @@ -13,7 +13,7 @@ import android.graphics.drawable.Drawable; import android.support.annotation.*; import android.support.annotation.WorkerThread; import android.support.media.ExifInterface; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import com.bumptech.glide.load.engine.DiskCacheStrategy; diff --git a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java index 29cac22fe2..2e6ea3510b 100644 --- a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java +++ b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java @@ -12,7 +12,7 @@ import android.os.RemoteException; import android.provider.ContactsContract; import android.support.annotation.NonNull; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; @@ -20,7 +20,6 @@ import com.annimon.stream.Stream; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.contacts.ContactAccessor; -import org.thoughtcrime.securesms.contacts.ContactsDatabase; import org.thoughtcrime.securesms.crypto.SessionUtil; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/util/GroupUtil.java b/src/org/thoughtcrime/securesms/util/GroupUtil.java index dea2f687d1..0d3ebf7416 100644 --- a/src/org/thoughtcrime/securesms/util/GroupUtil.java +++ b/src/org/thoughtcrime/securesms/util/GroupUtil.java @@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.Address; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientModifiedListener; diff --git a/src/org/thoughtcrime/securesms/util/IdentityUtil.java b/src/org/thoughtcrime/securesms/util/IdentityUtil.java index a1cfb8d043..e98096d1aa 100644 --- a/src/org/thoughtcrime/securesms/util/IdentityUtil.java +++ b/src/org/thoughtcrime/securesms/util/IdentityUtil.java @@ -7,7 +7,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.annotation.UiThread; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore; diff --git a/src/org/thoughtcrime/securesms/util/MediaUtil.java b/src/org/thoughtcrime/securesms/util/MediaUtil.java index 0b1cf13610..2dd9e72c22 100644 --- a/src/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/src/org/thoughtcrime/securesms/util/MediaUtil.java @@ -9,7 +9,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.WorkerThread; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; import android.webkit.MimeTypeMap; diff --git a/src/org/thoughtcrime/securesms/util/PlayServicesUtil.java b/src/org/thoughtcrime/securesms/util/PlayServicesUtil.java index 10e4d6d95d..75eb05465a 100644 --- a/src/org/thoughtcrime/securesms/util/PlayServicesUtil.java +++ b/src/org/thoughtcrime/securesms/util/PlayServicesUtil.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; diff --git a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java index ea46fe2b5d..c9de722e0f 100644 --- a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java +++ b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java @@ -7,12 +7,12 @@ import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.app.AlertDialog; -import android.util.Log; import android.webkit.MimeTypeMap; import android.widget.Toast; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.NoExternalStorageException; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask; import org.whispersystems.libsignal.util.Pair; diff --git a/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java b/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java index 4a4aec614e..a119213feb 100644 --- a/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java +++ b/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java @@ -1,13 +1,14 @@ package org.thoughtcrime.securesms.util; import android.support.annotation.NonNull; -import android.util.Log; import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.Phonenumber; import com.google.i18n.phonenumbers.ShortNumberInfo; +import org.thoughtcrime.securesms.logging.Log; + import java.util.HashSet; import java.util.Set; diff --git a/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java b/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java index 2a58736b01..9df12bd71b 100644 --- a/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java +++ b/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java @@ -22,7 +22,8 @@ import android.arch.lifecycle.Observer; import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; + +import org.thoughtcrime.securesms.logging.Log; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java b/src/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java index a822641d10..d7ca110bda 100644 --- a/src/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java +++ b/src/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.util; import android.telephony.SmsMessage; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; public class SmsCharacterCalculator extends CharacterCalculator { diff --git a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java b/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java index 92b9d2f370..f18cdc5ceb 100644 --- a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java +++ b/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java @@ -7,7 +7,6 @@ import android.support.v4.view.ViewCompat; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; -import android.util.Log; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/util/TelephonyUtil.java b/src/org/thoughtcrime/securesms/util/TelephonyUtil.java index 5d172ea086..87346cd16d 100644 --- a/src/org/thoughtcrime/securesms/util/TelephonyUtil.java +++ b/src/org/thoughtcrime/securesms/util/TelephonyUtil.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.res.Configuration; import android.net.ConnectivityManager; import android.telephony.TelephonyManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import java.util.Locale; diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java index 37556a3960..8abf14e1e2 100644 --- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java +++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java @@ -1,6 +1,5 @@ package org.thoughtcrime.securesms.util; -import android.content.ContentUris; import android.content.Context; import android.content.SharedPreferences; import android.hardware.Camera.CameraInfo; @@ -12,11 +11,10 @@ import android.support.annotation.ArrayRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.NotificationCompat; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.events.ReminderUpdateEvent; import org.thoughtcrime.securesms.jobs.requirements.SqlCipherMigrationRequirementProvider; import org.thoughtcrime.securesms.lock.RegistrationLockReminders; import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference; diff --git a/src/org/thoughtcrime/securesms/util/Util.java b/src/org/thoughtcrime/securesms/util/Util.java index 9f4a33070b..9a93698038 100644 --- a/src/org/thoughtcrime/securesms/util/Util.java +++ b/src/org/thoughtcrime/securesms/util/Util.java @@ -39,7 +39,7 @@ import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.style.StyleSpan; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import com.google.android.mms.pdu_alt.CharacterSets; import com.google.android.mms.pdu_alt.EncodedStringValue; diff --git a/src/org/thoughtcrime/securesms/video/VideoPlayer.java b/src/org/thoughtcrime/securesms/video/VideoPlayer.java index 184188c06b..e9ba5fb5aa 100644 --- a/src/org/thoughtcrime/securesms/video/VideoPlayer.java +++ b/src/org/thoughtcrime/securesms/video/VideoPlayer.java @@ -21,7 +21,6 @@ import android.os.Build; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.AttributeSet; -import android.util.Log; import android.view.Window; import android.view.WindowManager; import android.widget.FrameLayout; @@ -53,6 +52,7 @@ import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.AttachmentServer; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.VideoSlide; import org.thoughtcrime.securesms.util.ViewUtil; diff --git a/src/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java b/src/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java index a7b891e7fb..a1f9d70bf2 100644 --- a/src/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java +++ b/src/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java @@ -7,7 +7,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.ResultReceiver; import android.telephony.TelephonyManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.service.WebRtcCallService; diff --git a/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java b/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java index 3e9191ecd8..f6b3fbff9f 100644 --- a/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java +++ b/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.webrtc; import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.concurrent.SettableFuture; import org.webrtc.AudioSource; @@ -21,7 +21,6 @@ import org.webrtc.PeerConnection; import org.webrtc.PeerConnectionFactory; import org.webrtc.SdpObserver; import org.webrtc.SessionDescription; -import org.webrtc.VideoRenderer; import org.webrtc.VideoSink; import org.webrtc.VideoSource; import org.webrtc.VideoTrack; diff --git a/src/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java b/src/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java index 2899ed2aa0..2c10e65af8 100644 --- a/src/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java +++ b/src/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.webrtc; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import java.util.ArrayList; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java b/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java index a27d9d266e..c883c70c45 100644 --- a/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java +++ b/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java @@ -14,7 +14,7 @@ import android.os.Build; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.ServiceUtil; diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java b/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java index 15f5cbb798..d2e5b7e481 100644 --- a/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java +++ b/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java @@ -10,7 +10,7 @@ import android.os.Build; import android.os.Vibrator; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.ServiceUtil; diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java b/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java index a61d090928..7253cefc47 100644 --- a/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java +++ b/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java @@ -5,7 +5,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.net.Uri; import android.support.annotation.NonNull; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java b/src/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java index 19f1ce5c13..ed5ba88e78 100644 --- a/src/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java +++ b/src/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java @@ -23,7 +23,7 @@ import android.hardware.SensorEventListener; import android.hardware.SensorManager; import android.os.Handler; import android.os.Message; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; /** * This class is used to listen to the accelerometer to monitor the diff --git a/src/org/thoughtcrime/securesms/webrtc/locks/LockManager.java b/src/org/thoughtcrime/securesms/webrtc/locks/LockManager.java index 6093183abf..0eb278a0f7 100644 --- a/src/org/thoughtcrime/securesms/webrtc/locks/LockManager.java +++ b/src/org/thoughtcrime/securesms/webrtc/locks/LockManager.java @@ -4,7 +4,7 @@ import android.content.Context; import android.net.wifi.WifiManager; import android.os.PowerManager; import android.provider.Settings; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; /** * Maintains wake lock state. diff --git a/src/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java b/src/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java index 7c86469864..938381e7ea 100644 --- a/src/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java +++ b/src/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.webrtc.locks; import android.os.Build; import android.os.PowerManager; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/test/unitTest/java/org/thoughtcrime/securesms/BaseUnitTest.java b/test/unitTest/java/org/thoughtcrime/securesms/BaseUnitTest.java index 41d35df43d..64b3165490 100644 --- a/test/unitTest/java/org/thoughtcrime/securesms/BaseUnitTest.java +++ b/test/unitTest/java/org/thoughtcrime/securesms/BaseUnitTest.java @@ -6,7 +6,7 @@ import android.os.Handler; import android.os.Looper; import android.preference.PreferenceManager; import android.text.TextUtils; -import android.util.Log; +import org.thoughtcrime.securesms.logging.Log; import org.junit.Before; import org.junit.runner.RunWith;