TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-21 10:51:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable input bar for RSS feeds

Browse Source
This commit is contained in:
Niels Andriesse 2019-08-28 15:17:13 +10:00
parent fb8104cd18
commit 386b219076
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -2124,21 +2124,30 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
updateLinkPreviewState(); updateLinkPreviewState();
} }
@Override @Override
public void handleThreadFriendRequestStatusChanged(long threadID) { public void handleThreadFriendRequestStatusChanged(long threadID) {
if (threadID != this.threadId) { return; } if (threadID != this.threadId) { return; }
new Handler(getMainLooper()).post(this::updateInputPanel); new Handler(getMainLooper()).post(this::updateInputPanel);
} }
private void updateInputPanel() { private void updateInputPanel() {
boolean hasPendingFriendRequest = DatabaseFactory.getLokiThreadDatabase(this).hasPendingFriendRequest(threadId); Recipient recipient = DatabaseFactory.getThreadDatabase(this).getRecipientForThreadId(threadId);
inputPanel.setEnabled(!hasPendingFriendRequest); boolean isGroup = recipient.isGroupRecipient();
int hintID = hasPendingFriendRequest ? R.string.activity_conversation_pending_friend_request_hint : R.string.activity_conversation_default_hint; if (isGroup) {
inputPanel.setHint(getResources().getString(hintID)); boolean isRSSFeed = recipient.getName().equals("Loki News") || recipient.getName().equals("Loki Messenger Updates"); // TODO: This is just a temporary hack and should be removed ASAP
if (!hasPendingFriendRequest) { inputPanel.setEnabled(!isRSSFeed);
inputPanel.composeText.requestFocus(); String hint = isRSSFeed ? "Input disabled" : "New Message";
InputMethodManager inputMethodManager = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE); inputPanel.setHint(hint);
inputMethodManager.showSoftInput(inputPanel.composeText, 0); } else {
boolean hasPendingFriendRequest = DatabaseFactory.getLokiThreadDatabase(this).hasPendingFriendRequest(threadId);
inputPanel.setEnabled(!hasPendingFriendRequest);
int hintID = hasPendingFriendRequest ? R.string.activity_conversation_pending_friend_request_hint : R.string.activity_conversation_default_hint;
inputPanel.setHint(getResources().getString(hintID));
if (!hasPendingFriendRequest) {
inputPanel.composeText.requestFocus();
InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
inputMethodManager.showSoftInput(inputPanel.composeText, 0);
}
} }
} }
@ -2189,8 +2198,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
Log.w(TAG, ex); Log.w(TAG, ex);
} catch (InvalidMessageException ex) { } catch (InvalidMessageException ex) {
Toast.makeText(ConversationActivity.this, R.string.ConversationActivity_message_is_empty_exclamation, // Toast.makeText(ConversationActivity.this, R.string.ConversationActivity_message_is_empty_exclamation,
Toast.LENGTH_SHORT).show(); // Toast.LENGTH_SHORT).show();
Log.w(TAG, ex); Log.w(TAG, ex);
} }
} }