Make fingerprint changes optionally non-blocking

Also complete the rename from "identity" to "safety numbers."

// FREEBIE

src/org/thoughtcrime/securesms/database/SmsDatabase.java

@@ -489,7 +489,8 @@ public class SmsDatabase extends MessagingDatabase {
       type |= Types.END_SESSION_BIT;
     }
 
-    if (message.isPush()) type |= Types.PUSH_MESSAGE_BIT;
+    if (message.isPush())           type |= Types.PUSH_MESSAGE_BIT;
+    if (message.isIdentityUpdate()) type |= Types.KEY_EXCHANGE_IDENTITY_UPDATE_BIT;
 
     Recipients recipients;
 
@@ -508,8 +509,9 @@ public class SmsDatabase extends MessagingDatabase {
       groupRecipients = RecipientFactory.getRecipientsFromString(context, message.getGroupId(), true);
     }
 
-    boolean    unread     = org.thoughtcrime.securesms.util.Util.isDefaultSmsProvider(context) ||
-                            message.isSecureMessage() || message.isPreKeyBundle();
+    boolean    unread     = (org.thoughtcrime.securesms.util.Util.isDefaultSmsProvider(context) ||
+                            message.isSecureMessage() || message.isPreKeyBundle()) &&
+                            !message.isIdentityUpdate();
 
     long       threadId;
 
@@ -542,7 +544,10 @@ public class SmsDatabase extends MessagingDatabase {
       DatabaseFactory.getThreadDatabase(context).setUnread(threadId);
     }
 
-    DatabaseFactory.getThreadDatabase(context).update(threadId, true);
+    if (!message.isIdentityUpdate()) {
+      DatabaseFactory.getThreadDatabase(context).update(threadId, true);
+    }
+
     notifyConversationListeners(threadId);
     jobManager.add(new TrimThreadJob(context, threadId));
 

src/org/thoughtcrime/securesms/database/model/MessageRecord.java

@@ -110,8 +110,10 @@ public abstract class MessageRecord extends DisplayRecord {
       return emphasisAdded(context.getString(R.string.MessageRecord_s_is_on_signal_say_hey, getIndividualRecipient().toShortString()));
     } else if (isExpirationTimerUpdate()) {
       String sender = isOutgoing() ? context.getString(R.string.MessageRecord_you) : getIndividualRecipient().toShortString();
-      String time   = ExpirationUtil.getExpirationDisplayValue(context, (int)(getExpiresIn() / 1000));
+      String time   = ExpirationUtil.getExpirationDisplayValue(context, (int) (getExpiresIn() / 1000));
       return emphasisAdded(context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, sender, time));
+    } else if (isIdentityUpdate()) {
+      return emphasisAdded(String.format("Your safety numbers with %s have changed", getIndividualRecipient().toShortString()));
     } else if (getBody().getBody().length() > MAX_DISPLAY_LENGTH) {
       return new SpannableString(getBody().getBody().substring(0, MAX_DISPLAY_LENGTH));
     }

src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java

@@ -75,9 +75,7 @@ public class SmsMessageRecord extends MessageRecord {
     } else if (MmsSmsColumns.Types.isLegacyType(type)) {
       return emphasisAdded(context.getString(R.string.MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported));
     } else if (isBundleKeyExchange()) {
-      return emphasisAdded(context.getString(R.string.SmsMessageRecord_received_message_with_unknown_identity_key_tap_to_process));
-    } else if (isIdentityUpdate()) {
-      return emphasisAdded(context.getString(R.string.SmsMessageRecord_received_updated_but_unknown_identity_information));
+      return emphasisAdded(context.getString(R.string.SmsMessageRecord_received_message_with_new_safety_numbers_tap_to_process));
     } else if (isKeyExchange() && isOutgoing()) {
       return new SpannableString("");
     } else if (isKeyExchange() && !isOutgoing()) {

src/org/thoughtcrime/securesms/database/model/ThreadRecord.java

@@ -100,8 +100,10 @@ public class ThreadRecord extends DisplayRecord {
     } else if (SmsDatabase.Types.isJoinedType(type)) {
       return emphasisAdded(context.getString(R.string.ThreadRecord_s_is_on_signal_say_hey, getRecipients().getPrimaryRecipient().toShortString()));
     } else if (SmsDatabase.Types.isExpirationTimerUpdate(type)) {
-      String time   = ExpirationUtil.getExpirationDisplayValue(context, (int)(getExpiresIn() / 1000));
+      String time = ExpirationUtil.getExpirationDisplayValue(context, (int) (getExpiresIn() / 1000));
       return emphasisAdded(context.getString(R.string.ThreadRecord_disappearing_message_time_updated_to_s, time));
+    } else if (SmsDatabase.Types.isIdentityUpdate(type)) {
+      return emphasisAdded(String.format("Your safety numbers with %s have changed", getRecipients().getPrimaryRecipient().toShortString()));
     } else {
       if (TextUtils.isEmpty(getBody().getBody())) {
         return new SpannableString(emphasisAdded(context.getString(R.string.ThreadRecord_media_message)));

src/org/thoughtcrime/securesms/jobs/IdentityUpdateJob.java

+package org.thoughtcrime.securesms.jobs;
+
+import android.content.Context;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.GroupDatabase;
+import org.thoughtcrime.securesms.database.SmsDatabase;
+import org.thoughtcrime.securesms.database.ThreadDatabase;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientFactory;
+import org.thoughtcrime.securesms.recipients.Recipients;
+import org.thoughtcrime.securesms.sms.IncomingIdentityUpdateMessage;
+import org.thoughtcrime.securesms.sms.IncomingTextMessage;
+import org.whispersystems.jobqueue.JobParameters;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
+
+public class IdentityUpdateJob extends MasterSecretJob {
+
+  private final long recipientId;
+
+  public IdentityUpdateJob(Context context, long recipientId) {
+    super(context, JobParameters.newBuilder()
+                                .withGroupId(IdentityUpdateJob.class.getName())
+                                .withPersistence()
+                                .create());
+    this.recipientId = recipientId;
+  }
+
+  @Override
+  public void onRun(MasterSecret masterSecret) throws Exception {
+    Recipient            recipient      = RecipientFactory.getRecipientForId(context, recipientId, true);
+    Recipients           recipients     = RecipientFactory.getRecipientsFor(context, recipient, true);
+    String               number         = recipient.getNumber();
+    long                 time           = System.currentTimeMillis();
+    SmsDatabase          smsDatabase    = DatabaseFactory.getSmsDatabase(context);
+    ThreadDatabase       threadDatabase = DatabaseFactory.getThreadDatabase(context);
+    GroupDatabase        groupDatabase  = DatabaseFactory.getGroupDatabase(context);
+    GroupDatabase.Reader reader         = groupDatabase.getGroups();
+
+    GroupDatabase.GroupRecord groupRecord;
+
+    while ((groupRecord = reader.getNext()) != null) {
+      if (groupRecord.getMembers().contains(number)) {
+        SignalServiceGroup            group       = new SignalServiceGroup(groupRecord.getId());
+        IncomingTextMessage           incoming    = new IncomingTextMessage(number, 1, time, null, Optional.of(group), 0);
+        IncomingIdentityUpdateMessage groupUpdate = new IncomingIdentityUpdateMessage(incoming);
+
+        smsDatabase.insertMessageInbox(groupUpdate);
+      }
+    }
+
+    if (threadDatabase.getThreadIdIfExistsFor(recipients) != -1) {
+      IncomingTextMessage           incoming         = new IncomingTextMessage(number, 1, time, null, Optional.<SignalServiceGroup>absent(), 0);
+      IncomingIdentityUpdateMessage individualUpdate = new IncomingIdentityUpdateMessage(incoming);
+      smsDatabase.insertMessageInbox(individualUpdate);
+    }
+  }
+
+  @Override
+  public boolean onShouldRetryThrowable(Exception exception) {
+    return false;
+  }
+
+  @Override
+  public void onAdded() {
+
+  }
+
+  @Override
+  public void onCanceled() {
+
+  }
+}

src/org/thoughtcrime/securesms/sms/IncomingIdentityUpdateMessage.java

+package org.thoughtcrime.securesms.sms;
+
+public class IncomingIdentityUpdateMessage extends IncomingTextMessage {
+
+  public IncomingIdentityUpdateMessage(IncomingTextMessage base) {
+    super(base, "");
+  }
+
+  @Override
+  public boolean isIdentityUpdate() {
+    return true;
+  }
+
+}

src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java

@@ -215,6 +215,10 @@ public class IncomingTextMessage implements Parcelable {
     return false;
   }
 
+  public boolean isIdentityUpdate() {
+    return false;
+  }
+
   @Override
   public int describeContents() {
     return 0;

src/org/thoughtcrime/securesms/util/IdentityUtil.java

+package org.thoughtcrime.securesms.util;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.support.annotation.UiThread;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
+import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
+import org.whispersystems.libsignal.IdentityKey;
+import org.whispersystems.libsignal.SignalProtocolAddress;
+import org.whispersystems.libsignal.state.SessionRecord;
+import org.whispersystems.libsignal.state.SessionStore;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+
+public class IdentityUtil {
+
+  @UiThread
+  public static ListenableFuture<Optional<IdentityKey>> getRemoteIdentityKey(final Context context,
+                                                                             final MasterSecret masterSecret,
+                                                                             final Recipient recipient)
+  {
+    final SettableFuture<Optional<IdentityKey>> future = new SettableFuture<>();
+
+    new AsyncTask<Recipient, Void, Optional<IdentityKey>>() {
+      @Override
+      protected Optional<IdentityKey> doInBackground(Recipient... recipient) {
+        SessionStore          sessionStore   = new TextSecureSessionStore(context, masterSecret);
+        SignalProtocolAddress axolotlAddress = new SignalProtocolAddress(recipient[0].getNumber(), SignalServiceAddress.DEFAULT_DEVICE_ID);
+        SessionRecord         record         = sessionStore.loadSession(axolotlAddress);
+
+        if (record == null) {
+          return Optional.absent();
+        }
+
+        return Optional.fromNullable(record.getSessionState().getRemoteIdentityKey());
+      }
+
+      @Override
+      protected void onPostExecute(Optional<IdentityKey> result) {
+        future.set(result);
+      }
+    }.execute(recipient);
+
+    return future;
+  }
+
+}

src/org/thoughtcrime/securesms/util/TextSecurePreferences.java

@@ -73,6 +73,7 @@ public class TextSecurePreferences {
   private static final String SIGNALING_KEY_PREF               = "pref_signaling_key";
   private static final String DIRECTORY_FRESH_TIME_PREF        = "pref_directory_refresh_time";
   private static final String IN_THREAD_NOTIFICATION_PREF      = "pref_key_inthread_notifications";
+  private static final String BLOCKING_IDENTITY_CHANGES_PREF   = "pref_blocking_identity_changes";
 
   private static final String LOCAL_REGISTRATION_ID_PREF       = "pref_local_registration_id";
   private static final String SIGNED_PREKEY_REGISTERED_PREF    = "pref_signed_prekey_registered";
@@ -113,6 +114,14 @@ public class TextSecurePreferences {
     return getBooleanPreference(context, MULTI_DEVICE_PROVISIONED_PREF, false);
   }
 
+  public static boolean isBlockingIdentityUpdates(Context context) {
+    return getBooleanPreference(context, BLOCKING_IDENTITY_CHANGES_PREF, false);
+  }
+
+  public static void setBlockingIdentityUpdates(Context context, boolean value) {
+    setBooleanPreference(context, BLOCKING_IDENTITY_CHANGES_PREF, value);
+  }
+
   public static NotificationPrivacyPreference getNotificationPrivacy(Context context) {
     return new NotificationPrivacyPreference(getStringPreference(context, NOTIFICATION_PRIVACY_PREF, "all"));
   }