Refactoring.

This commit is contained in:
Mikunj
2019-11-14 12:00:46 +11:00
parent 44ccc66ec2
commit d1289ec7bd
10 changed files with 12 additions and 48 deletions

View File

@@ -3050,18 +3050,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
Address contact = DatabaseFactory.getThreadDatabase(this).getRecipientForThreadId(threadId).getAddress();
String contactPubKey = contact.toString();
Context context = this;
AsyncTask.execute(() -> {
try {
MessageSender.sendBackgroundMessageToAllDevices(this, contactPubKey);
MessageSender.syncContact(this, contact);
DatabaseFactory.getLokiThreadDatabase(context).setFriendRequestStatus(threadId, LokiThreadFriendRequestStatus.FRIENDS);
lokiMessageDatabase.setFriendRequestStatus(friendRequest.id, LokiMessageFriendRequestStatus.REQUEST_ACCEPTED);
Util.runOnMain(this::updateInputPanel);
} catch (Exception e) {
Log.d("Loki", "Failed to send background message to: " + contactPubKey + ".");
}
});
DatabaseFactory.getLokiThreadDatabase(this).setFriendRequestStatus(threadId, LokiThreadFriendRequestStatus.FRIENDS);
lokiMessageDatabase.setFriendRequestStatus(friendRequest.id, LokiMessageFriendRequestStatus.REQUEST_ACCEPTED);
MessageSender.sendBackgroundMessageToAllDevices(this, contactPubKey);
MessageSender.syncContact(this, contact);
updateInputPanel();
}
@Override
@@ -3077,7 +3070,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
public boolean isNoteToSelf() {
return TextSecurePreferences.getLocalNumber(this).equalsIgnoreCase(recipient.getAddress().serialize());
return TextSecurePreferences.getLocalNumber(this).equals(recipient.getAddress().serialize());
}
// endregion
}