diff --git a/res/drawable/icon_crown.xml b/res/drawable/ic_crown.xml
similarity index 100%
rename from res/drawable/icon_crown.xml
rename to res/drawable/ic_crown.xml
diff --git a/res/drawable/scroll_to_bottom_button_background.xml b/res/drawable/scroll_to_bottom_button_background.xml
index 68e512346c..387c75be90 100644
--- a/res/drawable/scroll_to_bottom_button_background.xml
+++ b/res/drawable/scroll_to_bottom_button_background.xml
@@ -1,5 +1,8 @@
-
+
+
\ No newline at end of file
diff --git a/res/layout-sw400dp/activity_display_name_v2.xml b/res/layout-sw400dp/activity_display_name.xml
similarity index 100%
rename from res/layout-sw400dp/activity_display_name_v2.xml
rename to res/layout-sw400dp/activity_display_name.xml
diff --git a/res/layout-sw400dp/activity_seed_v2.xml b/res/layout-sw400dp/activity_seed.xml
similarity index 100%
rename from res/layout-sw400dp/activity_seed_v2.xml
rename to res/layout-sw400dp/activity_seed.xml
diff --git a/res/layout/activity_display_name.xml b/res/layout/activity_display_name.xml
index fc934a4df0..443f6c23e0 100644
--- a/res/layout/activity_display_name.xml
+++ b/res/layout/activity_display_name.xml
@@ -1,58 +1,59 @@
-
+ android:layout_height="match_parent"
+ android:background="@drawable/default_session_background"
+ android:orientation="vertical">
-
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
-
+
-
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/res/layout/activity_display_name_v2.xml b/res/layout/activity_display_name_v2.xml
deleted file mode 100644
index 443f6c23e0..0000000000
--- a/res/layout/activity_display_name_v2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/layout/activity_seed.xml b/res/layout/activity_seed.xml
index cb77523182..a93318893d 100644
--- a/res/layout/activity_seed.xml
+++ b/res/layout/activity_seed.xml
@@ -1,158 +1,77 @@
-
+ android:background="@drawable/default_session_background"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="wrap_content" />
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/activity_seed_v2.xml b/res/layout/activity_seed_v2.xml
deleted file mode 100644
index a93318893d..0000000000
--- a/res/layout/activity_seed_v2.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 207591c0c6..179f4b2798 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -38,7 +38,7 @@
android:id="@+id/moderator_icon_image_view"
android:layout_width="20dp"
android:layout_height="20dp"
- android:src="@drawable/icon_crown"
+ android:src="@drawable/ic_crown"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" />
diff --git a/res/layout/view_mention_candidate.xml b/res/layout/view_mention_candidate.xml
index f572ea5549..24f01ebc66 100644
--- a/res/layout/view_mention_candidate.xml
+++ b/res/layout/view_mention_candidate.xml
@@ -23,7 +23,7 @@
android:id="@+id/moderatorIconImageView"
android:layout_width="16dp"
android:layout_height="16dp"
- android:src="@drawable/icon_crown"
+ android:src="@drawable/ic_crown"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" />
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index efb1d1fee6..901be074bb 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -191,7 +191,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
}
// Loki - Set up public chat manager
lokiPublicChatManager = new LokiPublicChatManager(this);
- updatePublicChatProfileAvatarIfNeeded();
+ updatePublicChatProfilePictureIfNeeded();
}
@Override
@@ -202,6 +202,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
KeyCachingService.onAppForegrounded(this);
// Loki - Start long polling if needed
startLongPollingIfNeeded();
+ // Loki - Start open group polling if needed
lokiPublicChatManager.startPollersIfNeeded();
}
@@ -530,7 +531,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
public void createRSSFeedsIfNeeded() {
ArrayList feeds = new ArrayList<>();
- feeds.add(lokiNewsFeed());
+// feeds.add(lokiNewsFeed());
feeds.add(lokiMessengerUpdatesFeed());
for (LokiRSSFeed feed : feeds) {
boolean isFeedSetUp = TextSecurePreferences.isChatSetUp(this, feed.getId());
@@ -586,7 +587,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
if (lokiMessengerUpdatesFeedPoller != null) lokiMessengerUpdatesFeedPoller.startIfNeeded();
}
- public void updatePublicChatProfileAvatarIfNeeded() {
+ public void updatePublicChatProfilePictureIfNeeded() {
AsyncTask.execute(() -> {
LokiPublicChatAPI publicChatAPI = null;
try {
diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
index 74d7f81b32..b42dafc29a 100644
--- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -422,7 +422,7 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
ProfileKeyUtil.setEncodedProfileKey(context, newProfileKey);
// Update profile key on the public chat server
- ApplicationContext.getInstance(context).updatePublicChatProfileAvatarIfNeeded();
+ ApplicationContext.getInstance(context).updatePublicChatProfilePictureIfNeeded();
} catch (Exception e) {
Log.d("Loki", "Failed to upload profile photo: " + e);
return false;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 41cb2330ce..df801ae584 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -331,7 +331,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private MenuItem searchViewItem;
private ProgressBar messageStatusProgressBar;
private ImageView muteIndicatorImageView;
- private TextView actionBarSubtitleTextView;
+ private TextView subtitleTextView;
private AttachmentTypeSelector attachmentTypeSelector;
private AttachmentManager attachmentManager;
@@ -362,6 +362,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private final DynamicNoActionBarTheme dynamicTheme = new DynamicNoActionBarTheme();
private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+ // Message Status Bar
private ArrayList broadcastReceivers = new ArrayList<>();
private String messageStatus = null;
@@ -552,7 +553,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
initializeIdentityRecords();
composeText.setTransport(sendButton.getSelectedTransport());
- updateTitleTextView(glideRequests, recipient);
+ updateTitleTextView(recipient);
updateSubtitleTextView();
setActionBarColor(recipient.getColor());
setBlockedUserState(recipient, isSecureText, isDefaultSms);
@@ -645,7 +646,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
case GROUP_EDIT:
recipient = Recipient.from(this, data.getParcelableExtra(GroupCreateActivity.GROUP_ADDRESS_EXTRA), true);
recipient.addListener(this);
- updateTitleTextView(glideRequests, recipient);
+ updateTitleTextView(recipient);
updateSubtitleTextView();
NotificationChannels.updateContactChannelName(this, recipient);
setBlockedUserState(recipient, isSecureText, isDefaultSms);
@@ -749,9 +750,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
MenuInflater inflater = this.getMenuInflater();
menu.clear();
- boolean isLokiGroupChat = recipient.getAddress().isPublicChat() || recipient.getAddress().isRSSFeed();
+ boolean isOpenGroupOrRSSFeed = recipient.getAddress().isPublicChat() || recipient.getAddress().isRSSFeed();
- if (isSecureText && !isLokiGroupChat) {
+ if (isSecureText && !isOpenGroupOrRSSFeed) {
if (recipient.getExpireMessages() > 0) {
inflater.inflate(R.menu.conversation_expiring_on, menu);
@@ -771,7 +772,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (isSecureText) inflater.inflate(R.menu.conversation_callable_secure, menu);
else inflater.inflate(R.menu.conversation_callable_insecure, menu);
*/
- } else if (isGroupConversation() && !isLokiGroupChat) {
+ } else if (isGroupConversation() && !isOpenGroupOrRSSFeed) {
inflater.inflate(R.menu.conversation_group_options, menu);
if (!isPushGroupConversation()) {
@@ -1688,7 +1689,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
sessionRestoreBannerView = ViewUtil.findById(this, R.id.sessionRestoreBannerView);
messageStatusProgressBar = ViewUtil.findById(this, R.id.messageStatusProgressBar);
muteIndicatorImageView = ViewUtil.findById(this, R.id.muteIndicatorImageView);
- actionBarSubtitleTextView = ViewUtil.findById(this, R.id.subtitleTextView);
+ subtitleTextView = ViewUtil.findById(this, R.id.subtitleTextView);
ImageButton quickCameraToggle = ViewUtil.findById(this, R.id.quick_camera_toggle);
ImageButton inlineAttachmentButton = ViewUtil.findById(this, R.id.inline_attachment_button);
@@ -1879,7 +1880,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
Log.i(TAG, "onModified(" + recipient.getAddress().serialize() + ")");
Util.runOnMain(() -> {
Log.i(TAG, "onModifiedRun(): " + recipient.getRegistered());
- updateTitleTextView(glideRequests, recipient);
+ updateTitleTextView(recipient);
updateSubtitleTextView();
// titleView.setVerified(identityRecords.isVerified());
setBlockedUserState(recipient, isSecureText, isDefaultSms);
@@ -2322,33 +2323,29 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void updateInputPanel() {
/*
- isFriendsWithAnyDevice caches whether we are friends with any of the other users device.
+ isFriendsWithAnyDevice reflects whether we are friends with any of the other user's devices.
- This stops the case where the input panel disables and enables rapidly.
- - This can occur when we are not friends with the current thread BUT multi-device tells us that we are friends with another one of their devices.
+ This fixes the case where the input panel disables and enables rapidly, which can occur when we are
+ not friends with the current thread BUT multi device tells us that we are friends with another one of their devices.
*/
- if (recipient.isGroupRecipient() || isNoteToSelf() || isFriendsWithAnyDevice) {
- setInputPanelEnabled(true);
- return;
- }
+ if (recipient.isGroupRecipient() || isNoteToSelf() || isFriendsWithAnyDevice) { setInputPanelEnabled(true); return; }
- // It could take a while before our promise resolves, so we assume the best case
+ // Disable the input panel if a friend request is pending
LokiThreadFriendRequestStatus friendRequestStatus = DatabaseFactory.getLokiThreadDatabase(this).getFriendRequestStatus(threadId);
boolean isPending = friendRequestStatus == LokiThreadFriendRequestStatus.REQUEST_SENDING || friendRequestStatus == LokiThreadFriendRequestStatus.REQUEST_SENT || friendRequestStatus == LokiThreadFriendRequestStatus.REQUEST_RECEIVED;
setInputPanelEnabled(!isPending);
- // We should always have the input panel enabled if we are friends with the current user
- isFriendsWithAnyDevice = friendRequestStatus == LokiThreadFriendRequestStatus.FRIENDS;
+ // Always enable the input panel if we are friends with the current user
+ isFriendsWithAnyDevice = (friendRequestStatus == LokiThreadFriendRequestStatus.FRIENDS);
- // Multi-device input logic
if (!isFriendsWithAnyDevice) {
- // We should enable the input if we don't have any pending friend requests OR we are friends with a linked device
- MultiDeviceUtilities.hasPendingFriendRequestWithAnyLinkedDevice(this, recipient).success(hasPendingRequests -> {
+ // Enable the input panel if we don't have any pending friend requests OR we are friends with one of the user's linked devices
+ MultiDeviceUtilities.hasPendingFriendRequestWithAnyLinkedDevice(this, recipient).success( hasPendingRequests -> {
if (!hasPendingRequests) {
setInputPanelEnabled(true);
} else {
- MultiDeviceUtilities.isFriendsWithAnyLinkedDevice(this, recipient).success(isFriends -> {
- // If we are friend with any of the other devices then we want to make sure the input panel is always enabled for the duration of this conversation
+ MultiDeviceUtilities.isFriendsWithAnyLinkedDevice(this, recipient).success( isFriends -> {
+ // Enable the input panel if we're friends with any of the user's devices
isFriendsWithAnyDevice = isFriends;
setInputPanelEnabled(isFriends);
return Unit.INSTANCE;
@@ -2574,7 +2571,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
private void updateToggleButtonState() {
- // Don't allow attachments if we're not friends with any device
+ // Don't allow attachments if we're not friends with any of the user's devices
if (!isNoteToSelf() && !recipient.isGroupRecipient() && !isFriendsWithAnyDevice) {
buttonToggle.display(sendButton);
quickAttachmentToggle.hide();
@@ -3169,7 +3166,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
// region Loki
- private void updateTitleTextView(GlideRequests glide, Recipient recipient) {
+ private void updateTitleTextView(Recipient recipient) {
String userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(this);
Set deviceLinks = DatabaseFactory.getLokiAPIDatabase(this).getDeviceLinks(userHexEncodedPublicKey);
HashSet userLinkedDeviceHexEncodedPublicKeys = new HashSet<>();
@@ -3183,45 +3180,46 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} else if (userLinkedDeviceHexEncodedPublicKeys.contains(recipient.getAddress().toString().toLowerCase())) {
titleTextView.setText("Note to Self");
} else {
- titleTextView.setText((recipient.getName() == null || recipient.getName().isEmpty()) ? recipient.getAddress().toString() : recipient.getName());
+ boolean hasName = (recipient.getName() != null && !recipient.getName().isEmpty());
+ titleTextView.setText(hasName ? recipient.getName() : recipient.getAddress().toString());
}
}
private void updateSubtitleTextView() {
muteIndicatorImageView.setVisibility(View.GONE);
- actionBarSubtitleTextView.setVisibility(View.VISIBLE);
+ subtitleTextView.setVisibility(View.VISIBLE);
if (messageStatus != null) {
switch (messageStatus) {
- case "calculatingPoW": actionBarSubtitleTextView.setText("Encrypting message"); break;
- case "contactingNetwork": actionBarSubtitleTextView.setText("Tracing a path"); break;
- case "sendingMessage": actionBarSubtitleTextView.setText("Sending message"); break;
- case "messageSent": actionBarSubtitleTextView.setText("Message sent securely"); break;
- case "messageFailed": actionBarSubtitleTextView.setText("Message failed to send"); break;
+ case "calculatingPoW": subtitleTextView.setText("Encrypting message"); break;
+ case "contactingNetwork": subtitleTextView.setText("Tracing a path"); break;
+ case "sendingMessage": subtitleTextView.setText("Sending message"); break;
+ case "messageSent": subtitleTextView.setText("Message sent securely"); break;
+ case "messageFailed": subtitleTextView.setText("Message failed to send"); break;
}
} else if (recipient.isMuted()) {
muteIndicatorImageView.setVisibility(View.VISIBLE);
- actionBarSubtitleTextView.setText("Muted until " + DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault()));
+ subtitleTextView.setText("Muted until " + DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault()));
} else if (recipient.isGroupRecipient() && recipient.getName() != null && !recipient.getName().equals("Session Updates") && !recipient.getName().equals("Loki News")) {
LokiPublicChat publicChat = DatabaseFactory.getLokiThreadDatabase(this).getPublicChat(threadId);
if (publicChat != null) {
Integer userCount = DatabaseFactory.getLokiAPIDatabase(this).getUserCount(publicChat.getChannel(), publicChat.getServer());
if (userCount == null) { userCount = 0; }
if (userCount >= 200) {
- actionBarSubtitleTextView.setText("200+ members");
+ subtitleTextView.setText("200+ members");
} else {
- actionBarSubtitleTextView.setText(userCount + " members");
+ subtitleTextView.setText(userCount + " members");
}
} else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) {
- actionBarSubtitleTextView.setText(recipient.getAddress().toString());
+ subtitleTextView.setText(recipient.getAddress().toString());
} else {
- actionBarSubtitleTextView.setVisibility(View.GONE);
+ subtitleTextView.setVisibility(View.GONE);
}
} else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) {
- actionBarSubtitleTextView.setText(recipient.getAddress().toString());
+ subtitleTextView.setText(recipient.getAddress().toString());
} else {
- actionBarSubtitleTextView.setVisibility(View.GONE);
+ subtitleTextView.setVisibility(View.GONE);
}
- titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension((actionBarSubtitleTextView.getVisibility() == View.GONE) ? R.dimen.very_large_font_size : R.dimen.large_font_size));
+ titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension((subtitleTextView.getVisibility() == View.GONE) ? R.dimen.very_large_font_size : R.dimen.large_font_size));
}
private void setMessageStatusProgressAnimatedIfPossible(int progress) {
@@ -3293,18 +3291,17 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override
public void acceptFriendRequest(@NotNull MessageRecord friendRequest) {
- // Send the accept to the original friend request thread id
+ // Send the accept to the original friend request thread ID
LokiMessageDatabase lokiMessageDatabase = DatabaseFactory.getLokiMessageDatabase(this);
long originalThreadID = lokiMessageDatabase.getOriginalThreadID(friendRequest.id);
- long threadId = originalThreadID < 0 ? this.threadId : originalThreadID;
-
- Recipient contact = DatabaseFactory.getThreadDatabase(this).getRecipientForThreadId(threadId);
+ long threadID = originalThreadID < 0 ? this.threadId : originalThreadID;
+ Recipient contact = DatabaseFactory.getThreadDatabase(this).getRecipientForThreadId(threadID);
Address address = contact.getAddress();
- String contactPubKey = address.serialize();
- DatabaseFactory.getLokiThreadDatabase(this).setFriendRequestStatus(threadId, LokiThreadFriendRequestStatus.FRIENDS);
+ String contactHexEncodedPublicKey = address.serialize();
+ DatabaseFactory.getLokiThreadDatabase(this).setFriendRequestStatus(threadID, LokiThreadFriendRequestStatus.FRIENDS);
lokiMessageDatabase.setFriendRequestStatus(friendRequest.id, LokiMessageFriendRequestStatus.REQUEST_ACCEPTED);
DatabaseFactory.getRecipientDatabase(this).setProfileSharing(contact, true);
- MessageSender.sendBackgroundMessageToAllDevices(this, contactPubKey);
+ MessageSender.sendBackgroundMessageToAllDevices(this, contactHexEncodedPublicKey);
MessageSender.syncContact(this, address);
updateInputPanel();
}
@@ -3313,10 +3310,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
public void rejectFriendRequest(@NotNull MessageRecord friendRequest) {
LokiMessageDatabase lokiMessageDatabase = DatabaseFactory.getLokiMessageDatabase(this);
long originalThreadID = lokiMessageDatabase.getOriginalThreadID(friendRequest.id);
- long threadId = originalThreadID < 0 ? this.threadId : originalThreadID;
-
- DatabaseFactory.getLokiThreadDatabase(this).setFriendRequestStatus(threadId, LokiThreadFriendRequestStatus.NONE);
- String contactID = DatabaseFactory.getThreadDatabase(this).getRecipientForThreadId(threadId).getAddress().toString();
+ long threadID = originalThreadID < 0 ? this.threadId : originalThreadID;
+ DatabaseFactory.getLokiThreadDatabase(this).setFriendRequestStatus(threadID, LokiThreadFriendRequestStatus.NONE);
+ String contactID = DatabaseFactory.getThreadDatabase(this).getRecipientForThreadId(threadID).getAddress().toString();
DatabaseFactory.getLokiPreKeyBundleDatabase(this).removePreKeyBundle(contactID);
updateInputPanel();
}
@@ -3324,20 +3320,19 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
public boolean isNoteToSelf() {
return TextSecurePreferences.getLocalNumber(this).equals(recipient.getAddress().serialize());
}
- // endregion
public void restoreSession() {
- // Loki - User clicked restore session
if (recipient.isGroupRecipient()) { return; }
LokiThreadDatabase lokiThreadDatabase = DatabaseFactory.getLokiThreadDatabase(this);
SmsDatabase smsDatabase = DatabaseFactory.getSmsDatabase(this);
Set devices = lokiThreadDatabase.getSessionRestoreDevices(threadId);
for (String device : devices) { MessageSender.sendRestoreSessionMessage(this, device); }
- long messageId = smsDatabase.insertMessageOutbox(threadId, new OutgoingTextMessage(recipient,"", 0, 0), false, System.currentTimeMillis(), null);
- if (messageId > -1) {
- smsDatabase.markAsLokiSessionRestoreSent(messageId);
+ long messageID = smsDatabase.insertMessageOutbox(threadId, new OutgoingTextMessage(recipient,"", 0, 0), false, System.currentTimeMillis(), null);
+ if (messageID > -1) {
+ smsDatabase.markAsLokiSessionRestoreSent(messageID);
}
lokiThreadDatabase.removeAllSessionRestoreDevices(threadId);
updateSessionRestoreBanner();
}
+ // endregion
}
diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
index 0ef8ce54f8..468922c35b 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
@@ -1543,7 +1543,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
// Loki - If the recipient is our master device then we need to go and update our avatar mappings on the public chats
if (recipient.isOurMasterDevice()) {
- ApplicationContext.getInstance(context).updatePublicChatProfileAvatarIfNeeded();
+ ApplicationContext.getInstance(context).updatePublicChatProfilePictureIfNeeded();
}
}
}
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
index 5eb2a16be7..b6eaf24444 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
@@ -4,7 +4,7 @@ import android.content.Intent
import android.os.Bundle
import android.view.inputmethod.InputMethodManager
import android.widget.Toast
-import kotlinx.android.synthetic.main.activity_display_name_v2.*
+import kotlinx.android.synthetic.main.activity_display_name.*
import network.loki.messenger.R
import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.BaseActionBarActivity
@@ -19,7 +19,7 @@ class DisplayNameActivity : BaseActionBarActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setUpActionBarSessionLogo()
- setContentView(R.layout.activity_display_name_v2)
+ setContentView(R.layout.activity_display_name)
displayNameEditText.imeOptions = displayNameEditText.imeOptions or 16777216 // Always use incognito keyboard
registerButton.setOnClickListener { register() }
}
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt
index 59bcf5b256..8d0dc2e645 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt
@@ -9,7 +9,7 @@ import android.text.SpannableString
import android.text.style.ForegroundColorSpan
import android.widget.LinearLayout
import android.widget.Toast
-import kotlinx.android.synthetic.main.activity_seed_v2.*
+import kotlinx.android.synthetic.main.activity_seed.*
import network.loki.messenger.R
import org.thoughtcrime.securesms.BaseActionBarActivity
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
@@ -33,7 +33,7 @@ class SeedActivity : BaseActionBarActivity() {
// region Lifecycle
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_seed_v2)
+ setContentView(R.layout.activity_seed)
supportActionBar!!.title = "Your Recovery Phrase"
val seedReminderViewTitle = SpannableString("You're almost finished! 90%")
seedReminderViewTitle.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, theme)), 24, 27, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
index 79134bb621..cc96abad99 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
@@ -178,7 +178,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
AvatarHelper.setAvatar(this, Address.fromSerialized(TextSecurePreferences.getLocalNumber(this)), profilePicture)
TextSecurePreferences.setProfileAvatarId(this, SecureRandom().nextInt())
ProfileKeyUtil.setEncodedProfileKey(this, encodedProfileKey)
- ApplicationContext.getInstance(this).updatePublicChatProfileAvatarIfNeeded()
+ ApplicationContext.getInstance(this).updatePublicChatProfilePictureIfNeeded()
profilePictureView.update()
}
profilePictureToBeUploaded = null
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiPublicChatPoller.kt b/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiPublicChatPoller.kt
index 744cf414c6..9554190fe3 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiPublicChatPoller.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiPublicChatPoller.kt
@@ -208,7 +208,7 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
val database = DatabaseFactory.getRecipientDatabase(context)
database.setProfileKey(recipient, profileKey)
database.setProfileAvatar(recipient, url)
- ApplicationContext.getInstance(context).updatePublicChatProfileAvatarIfNeeded()
+ ApplicationContext.getInstance(context).updatePublicChatProfilePictureIfNeeded()
}
}
}