TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-12 12:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable expiration menu on inactive group

Browse Source 
Fixes #6007
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-01-03 13:36:34 -08:00
parent bb1ab2e929
commit 3861084ea2
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -510,6 +510,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
private void handleSelectMessageExpiration() { private void handleSelectMessageExpiration() {
if (isPushGroupConversation() && !isActiveGroup()) {
return;
}
ExpirationDialog.show(this, recipients.getExpireMessages(), new ExpirationDialog.OnClickListener() { ExpirationDialog.show(this, recipients.getExpireMessages(), new ExpirationDialog.OnClickListener() {
@Override @Override
public void onClick(final int expirationTime) { public void onClick(final int expirationTime) {

1
src/org/thoughtcrime/securesms/components/ComposeText.java
View File

@ -133,6 +133,7 @@ public class ComposeText extends EmojiEditText {
if (Build.VERSION.SDK_INT <= 13) return inputConnection; if (Build.VERSION.SDK_INT <= 13) return inputConnection;
if (mediaListener == null) return inputConnection; if (mediaListener == null) return inputConnection;
if (inputConnection == null) return null;
EditorInfoCompat.setContentMimeTypes(editorInfo, new String[] {"image/jpeg", "image/png", "image/gif"}); EditorInfoCompat.setContentMimeTypes(editorInfo, new String[] {"image/jpeg", "image/png", "image/gif"});
return InputConnectionCompat.createWrapper(inputConnection, editorInfo, new CommitContentListener(mediaListener)); return InputConnectionCompat.createWrapper(inputConnection, editorInfo, new CommitContentListener(mediaListener));