blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable disappearing message controls 

// FREEBIE
master
Moxie Marlinspike 2016-09-25 20:04:13 -07:00
parent 2b4d41de03
commit 14d73d82c3
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ import android.os.Vibrator;
import android.provider.Browser;
import android.provider.ContactsContract;
import android.support.annotation.NonNull;
import android.support.v4.view.MenuItemCompat;
import android.support.v4.view.WindowCompat;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
@ -128,6 +129,7 @@ import org.thoughtcrime.securesms.util.DirectoryHelper.UserCapabilities;
import org.thoughtcrime.securesms.util.DirectoryHelper.UserCapabilities.Capability;
import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.ExpirationUtil;
import org.thoughtcrime.securesms.util.GroupUtil;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
@ -388,25 +390,25 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
MenuInflater inflater = this.getMenuInflater();
menu.clear();
// if (isSecureText) {
// if (recipients.getExpireMessages() > 0) {
// inflater.inflate(R.menu.conversation_expiring_on, menu);
//
// final MenuItem item = menu.findItem(R.id.menu_expiring_messages);
// final View actionView = MenuItemCompat.getActionView(item);
// final TextView badgeView = (TextView)actionView.findViewById(R.id.expiration_badge);
//
// badgeView.setText(ExpirationUtil.getExpirationAbbreviatedDisplayValue(this, recipients.getExpireMessages()));
// actionView.setOnClickListener(new OnClickListener() {
// @Override
// public void onClick(View v) {
// onOptionsItemSelected(item);
// }
// });
// } else {
// inflater.inflate(R.menu.conversation_expiring_off, menu);
// }
// }
if (isSecureText) {
if (recipients.getExpireMessages() > 0) {
inflater.inflate(R.menu.conversation_expiring_on, menu);
final MenuItem item = menu.findItem(R.id.menu_expiring_messages);
final View actionView = MenuItemCompat.getActionView(item);
final TextView badgeView = (TextView)actionView.findViewById(R.id.expiration_badge);
badgeView.setText(ExpirationUtil.getExpirationAbbreviatedDisplayValue(this, recipients.getExpireMessages()));
actionView.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
onOptionsItemSelected(item);
}
});
} else {
inflater.inflate(R.menu.conversation_expiring_off, menu);
}
}
if (isSingleConversation()) {
if (isSecureVoice) inflater.inflate(R.menu.conversation_callable_secure, menu);