diff --git a/app/lint.xml b/app/lint.xml index d6dae28afa..70c158b8cc 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -20,7 +20,7 @@ - + diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java index f3db4b771c..f0c6363a15 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java @@ -41,6 +41,8 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences; public class PassphraseChangeActivity extends PassphraseActivity { + private static final String TAG = Log.tag(PassphraseChangeActivity.class); + private DynamicTheme dynamicTheme = new DynamicTheme(); private DynamicLanguage dynamicLanguage = new DynamicLanguage(); @@ -145,7 +147,7 @@ public class PassphraseChangeActivity extends PassphraseActivity { return masterSecret; } catch (InvalidPassphraseException e) { - Log.w(PassphraseChangeActivity.class.getSimpleName(), e); + Log.w(TAG, e); return null; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java index 95fffc9903..38e9edc78c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java @@ -119,7 +119,7 @@ public class MasterCipher { return encryptedAndMacBody; } catch (GeneralSecurityException ge) { - Log.w("bodycipher", ge); + Log.w(TAG, "bodycipher", ge); return null; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java index 2d569ccaf4..4cab6f9bdb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java @@ -56,6 +56,8 @@ import javax.crypto.spec.SecretKeySpec; public class MasterSecretUtil { + private static final String TAG = Log.tag(MasterSecretUtil.class); + public static final String UNENCRYPTED_PASSPHRASE = "unencrypted"; public static final String PREFERENCES_NAME = "SecureSMS-Preferences"; @@ -115,10 +117,10 @@ public class MasterSecretUtil { return new MasterSecret(new SecretKeySpec(encryptionSecret, "AES"), new SecretKeySpec(macSecret, "HmacSHA1")); } catch (GeneralSecurityException e) { - Log.w("keyutil", e); + Log.w(TAG, e); return null; //XXX } catch (IOException e) { - Log.w("keyutil", e); + Log.w(TAG, e); return null; //XXX } } @@ -183,7 +185,7 @@ public class MasterSecretUtil { return new MasterSecret(new SecretKeySpec(encryptionSecret, "AES"), new SecretKeySpec(macSecret, "HmacSHA1")); } catch (GeneralSecurityException e) { - Log.w("keyutil", e); + Log.w(TAG, e); return null; } } @@ -249,7 +251,7 @@ public class MasterSecretUtil { SecretKey key = generator.generateKey(); return key.getEncoded(); } catch (NoSuchAlgorithmException ex) { - Log.w("keyutil", ex); + Log.w(TAG, ex); return null; } } @@ -259,7 +261,7 @@ public class MasterSecretUtil { KeyGenerator generator = KeyGenerator.getInstance("HmacSHA1"); return generator.generateKey().getEncoded(); } catch (NoSuchAlgorithmException e) { - Log.w("keyutil", e); + Log.w(TAG, e); return null; } } @@ -290,10 +292,10 @@ public class MasterSecretUtil { if (scaledIterationTarget < MINIMUM_ITERATION_COUNT) return MINIMUM_ITERATION_COUNT; else return scaledIterationTarget; } catch (NoSuchAlgorithmException e) { - Log.w("MasterSecretUtil", e); + Log.w(TAG, e); return MINIMUM_ITERATION_COUNT; } catch (InvalidKeySpecException e) { - Log.w("MasterSecretUtil", e); + Log.w(TAG, e); return MINIMUM_ITERATION_COUNT; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java index c0a5c2679e..9565c34095 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java @@ -88,7 +88,7 @@ public class PublicKey { MessageDigest md = MessageDigest.getInstance("SHA-1"); return md.digest(serialize()); } catch (NoSuchAlgorithmException nsae) { - Log.w("LocalKeyPair", nsae); + Log.w(TAG, "LocalKeyPair", nsae); throw new IllegalArgumentException("SHA-1 isn't supported!"); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index a75ea6781e..6869592069 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -1360,7 +1360,7 @@ public class MmsDatabase extends MessagingDatabase { cursor = db.query(TABLE_NAME, new String[] {ID}, where, new String[] {threadId+""}, null, null, null); while (cursor != null && cursor.moveToNext()) { - Log.i("MmsDatabase", "Trimming: " + cursor.getLong(0)); + Log.i(TAG, "Trimming: " + cursor.getLong(0)); delete(cursor.getLong(0)); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index bedd10d7b5..3f6bea3157 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -153,7 +153,7 @@ public class SmsDatabase extends MessagingDatabase { } private void updateTypeBitmask(long id, long maskOff, long maskOn) { - Log.i("MessageDatabase", "Updating ID: " + id + " to base type: " + maskOn); + Log.i(TAG, "Updating ID: " + id + " to base type: " + maskOn); SQLiteDatabase db = databaseHelper.getWritableDatabase(); db.execSQL("UPDATE " + TABLE_NAME + @@ -368,7 +368,7 @@ public class SmsDatabase extends MessagingDatabase { } public void markStatus(long id, int status) { - Log.i("MessageDatabase", "Updating ID: " + id + " to status: " + status); + Log.i(TAG, "Updating ID: " + id + " to status: " + status); ContentValues contentValues = new ContentValues(); contentValues.put(STATUS, status); @@ -793,7 +793,7 @@ public class SmsDatabase extends MessagingDatabase { } public boolean deleteMessage(long messageId) { - Log.i("MessageDatabase", "Deleting: " + messageId); + Log.i(TAG, "Deleting: " + messageId); SQLiteDatabase db = databaseHelper.getWritableDatabase(); long threadId = getThreadIdForMessage(messageId); db.delete(TABLE_NAME, ID_WHERE, new String[] {messageId+""}); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java index 57f935893f..5c38af18e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java @@ -135,7 +135,7 @@ public class SmsMigrator { return null; } } catch (IllegalStateException iae) { - Log.w("SmsMigrator", iae); + Log.w(TAG, iae); return null; } finally { if (cursor != null) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index a34c9116ac..d53e6482e2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -248,19 +248,19 @@ public class ThreadDatabase extends Database { } public void trimThread(long threadId, int length) { - Log.i("ThreadDatabase", "Trimming thread: " + threadId + " to: " + length); + Log.i(TAG, "Trimming thread: " + threadId + " to: " + length); Cursor cursor = null; try { cursor = DatabaseFactory.getMmsSmsDatabase(context).getConversation(threadId); if (cursor != null && length > 0 && cursor.getCount() > length) { - Log.w("ThreadDatabase", "Cursor count is greater than length!"); + Log.w(TAG, "Cursor count is greater than length!"); cursor.moveToPosition(length - 1); long lastTweetDate = cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.NORMALIZED_DATE_RECEIVED)); - Log.i("ThreadDatabase", "Cut off tweet date: " + lastTweetDate); + Log.i(TAG, "Cut off tweet date: " + lastTweetDate); DatabaseFactory.getSmsDatabase(context).deleteMessagesInThreadBeforeDate(threadId, lastTweetDate); DatabaseFactory.getMmsDatabase(context).deleteMessagesInThreadBeforeDate(threadId, lastTweetDate); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java index f0f91150fa..a802828659 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java @@ -182,10 +182,10 @@ public class ClassicOpenHelper extends SQLiteOpenHelper { Cursor smsCursor = null; - Log.i("DatabaseFactory", "Upgrade count: " + (smsCount + threadCount)); + Log.i(TAG, "Upgrade count: " + (smsCount + threadCount)); do { - Log.i("DatabaseFactory", "Looping SMS cursor..."); + Log.i(TAG, "Looping SMS cursor..."); if (smsCursor != null) smsCursor.close(); @@ -224,7 +224,7 @@ public class ClassicOpenHelper extends SQLiteOpenHelper { new String[] {body, type+"", id+""}); } } catch (InvalidMessageException e) { - Log.w("DatabaseFactory", e); + Log.w(TAG, e); } } @@ -237,7 +237,7 @@ public class ClassicOpenHelper extends SQLiteOpenHelper { skip = 0; do { - Log.i("DatabaseFactory", "Looping thread cursor..."); + Log.i(TAG, "Looping thread cursor..."); if (threadCursor != null) threadCursor.close(); @@ -281,7 +281,7 @@ public class ClassicOpenHelper extends SQLiteOpenHelper { new String[] {snippet, snippetType+"", id+""}); } } catch (InvalidMessageException e) { - Log.w("DatabaseFactory", e); + Log.w(TAG, e); } } @@ -296,13 +296,13 @@ public class ClassicOpenHelper extends SQLiteOpenHelper { } if (fromVersion < LegacyMigrationJob.MMS_BODY_VERSION) { - Log.i("DatabaseFactory", "Update MMS bodies..."); + Log.i(TAG, "Update MMS bodies..."); MasterCipher masterCipher = new MasterCipher(masterSecret); Cursor mmsCursor = db.query("mms", new String[] {"_id"}, "msg_box & " + 0x80000000L + " != 0", null, null, null, null); - Log.i("DatabaseFactory", "Got MMS rows: " + (mmsCursor == null ? "null" : mmsCursor.getCount())); + Log.i(TAG, "Got MMS rows: " + (mmsCursor == null ? "null" : mmsCursor.getCount())); while (mmsCursor != null && mmsCursor.moveToNext()) { listener.setProgress(mmsCursor.getPosition(), mmsCursor.getCount()); @@ -336,7 +336,7 @@ public class ClassicOpenHelper extends SQLiteOpenHelper { dataFile.delete(); db.delete("part", "_id = ?", new String[] {partId+""}); } catch (IOException e) { - Log.w("DatabaseFactory", e); + Log.w(TAG, e); } } else if (MediaUtil.isAudioType(contentType) || MediaUtil.isImageType(contentType) || @@ -355,7 +355,7 @@ public class ClassicOpenHelper extends SQLiteOpenHelper { new String[] {partCount+"", mmsId+""}); } - Log.i("DatabaseFactory", "Updated body: " + body + " and part_count: " + partCount); + Log.i(TAG, "Updated body: " + body + " and part_count: " + partCount); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/LegacyMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/LegacyMigrationJob.java index d275a381b8..6815af7991 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/migrations/LegacyMigrationJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/LegacyMigrationJob.java @@ -102,7 +102,7 @@ public class LegacyMigrationJob extends MigrationJob { @Override void performMigration() throws RetryLaterException { - Log.i("DatabaseUpgradeActivity", "Running background upgrade.."); + Log.i(TAG, "Running background upgrade.."); int lastSeenVersion = VersionTracker.getLastSeenVersion(context); MasterSecret masterSecret = KeyCachingService.getMasterSecret(context); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/PartParser.java b/app/src/main/java/org/thoughtcrime/securesms/mms/PartParser.java index 39806d234a..340cef1b95 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/PartParser.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/PartParser.java @@ -12,6 +12,9 @@ import java.io.UnsupportedEncodingException; public class PartParser { + + private static final String TAG = Log.tag(PartParser.class); + public static String getMessageText(PduBody body) { String bodyText = null; @@ -31,7 +34,7 @@ public class PartParser { partText = ""; } } catch (UnsupportedEncodingException e) { - Log.w("PartParser", e); + Log.w(TAG, e); partText = "Unsupported Encoding!"; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java index 58666ac558..c2eac046a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java @@ -73,11 +73,11 @@ public class AndroidAutoReplyReceiver extends BroadcastReceiver { long expiresIn = recipient.getExpireMessages() * 1000L; if (recipient.resolve().isGroup()) { - Log.w("AndroidAutoReplyReceiver", "GroupRecipient, Sending media message"); + Log.w(TAG, "GroupRecipient, Sending media message"); OutgoingMediaMessage reply = new OutgoingMediaMessage(recipient, responseText.toString(), new LinkedList<>(), System.currentTimeMillis(), subscriptionId, expiresIn, false, 0, null, Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList()); replyThreadId = MessageSender.send(context, reply, threadId, false, null); } else { - Log.w("AndroidAutoReplyReceiver", "Sending regular message "); + Log.w(TAG, "Sending regular message "); OutgoingTextMessage reply = new OutgoingTextMessage(recipient, responseText.toString(), expiresIn, subscriptionId); replyThreadId = MessageSender.send(context, reply, threadId, false, null); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java index 8dd7450554..d8fed8cc9e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java @@ -639,7 +639,7 @@ public class MessageNotifier { } catch (Throwable t) { // NOTE :: I don't totally trust this thing, so I'm catching // everything. - Log.w("MessageNotifier", t); + Log.w(TAG, t); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java index 71308ca67c..2645c765f0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java @@ -87,7 +87,7 @@ public class KeyCachingService extends Service { try { return MasterSecretUtil.getMasterSecret(context, MasterSecretUtil.UNENCRYPTED_PASSPHRASE); } catch (InvalidPassphraseException e) { - Log.w("KeyCachingService", e); + Log.w(TAG, e); } } @@ -151,7 +151,7 @@ public class KeyCachingService extends Service { MasterSecret masterSecret = MasterSecretUtil.getMasterSecret(this, MasterSecretUtil.UNENCRYPTED_PASSPHRASE); setMasterSecret(masterSecret); } catch (InvalidPassphraseException e) { - Log.w("KeyCachingService", e); + Log.w(TAG, e); } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/SmsListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/SmsListener.java index d0624d1b9a..83a09531d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/SmsListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/SmsListener.java @@ -32,6 +32,8 @@ import org.thoughtcrime.securesms.util.Util; public class SmsListener extends BroadcastReceiver { + private static final String TAG = Log.tag(SmsListener.class); + private static final String SMS_RECEIVED_ACTION = Telephony.Sms.Intents.SMS_RECEIVED_ACTION; private static final String SMS_DELIVERED_ACTION = Telephony.Sms.Intents.SMS_DELIVER_ACTION; @@ -98,12 +100,12 @@ public class SmsListener extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - Log.i("SMSListener", "Got SMS broadcast..."); + Log.i(TAG, "Got SMS broadcast..."); if ((intent.getAction().equals(SMS_DELIVERED_ACTION)) || (intent.getAction().equals(SMS_RECEIVED_ACTION)) && isRelevant(context, intent)) { - Log.i("SmsListener", "Constructing SmsReceiveJob..."); + Log.i(TAG, "Constructing SmsReceiveJob..."); Object[] pdus = (Object[]) intent.getExtras().get("pdus"); int subscriptionId = intent.getExtras().getInt("subscription", -1); diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java index 3790228da7..fff1a27e6b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java @@ -504,7 +504,7 @@ public class MessageSender { expirationManager.scheduleDeletion(messageId, true, message.getExpiresIn()); } } catch (NoSuchMessageException | MmsException e) { - Log.w("Failed to update self-sent message.", e); + Log.w(TAG, "Failed to update self-sent message.", e); } } @@ -527,7 +527,7 @@ public class MessageSender { expirationManager.scheduleDeletion(message.getId(), message.isMms(), message.getExpiresIn()); } } catch (NoSuchMessageException e) { - Log.w("Failed to update self-sent message.", e); + Log.w(TAG, "Failed to update self-sent message.", e); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java index 2c10e65af8..f9b1e701c2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java @@ -12,6 +12,9 @@ import java.util.List; * Errors in one handler do not prevent subsequent handlers from being called. */ public class UncaughtExceptionHandlerManager implements Thread.UncaughtExceptionHandler { + + private static final String TAG = Log.tag(UncaughtExceptionHandlerManager.class); + private final Thread.UncaughtExceptionHandler originalHandler; private final List handlers = new ArrayList(); @@ -35,7 +38,7 @@ public class UncaughtExceptionHandlerManager implements Thread.UncaughtException try { handlers.get(i).uncaughtException(thread, throwable); } catch(Throwable t) { - Log.e("UncaughtExceptionHandlerManager", "Error in uncaught exception handling", t); + Log.e(TAG, "Error in uncaught exception handling", t); } } }