yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1612 from deltachat/disappearing-not-experimental

Browse source 
make 'disappearing messages' a standard-feature
This commit is contained in:
cyBerta 2020-09-09 15:42:40 +02:00 • committed by GitHub
commit 27e58cc3e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
res/menu/conversation.xml
View file

@ -26,8 +26,7 @@
app:showAsAction="always"/>
<item android:id="@+id/menu_ephemeral_messages"
android:title="@string/ephemeral_messages"
android:visible="false" />
android:title="@string/ephemeral_messages" />
<item android:title="@string/menu_mute"
android:id="@+id/menu_mute_notifications"/>

5
res/xml/preferences_advanced.xml
View file

@ -56,11 +56,6 @@
android:key="pref_location_streaming_enabled"
android:title="@string/pref_on_demand_location_streaming"/>
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false"
android:key="pref_ephemeral_messages"
android:title="Disappearing messages options"/>
<Preference android:key="pref_webrtc_instance"
android:title="Video chat instance"
android:summary="@string/none"/>

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

@ -447,10 +447,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
menu.findItem(R.id.menu_show_map).setVisible(false);
}
if (Prefs.isEphemeralMessagesEnabled(this) || dcContext.getChatEphemeralTimer(chatId) != 0) {
menu.findItem(R.id.menu_ephemeral_messages).setVisible(true);
}
if (!dcContext.isWebrtcConfigOk() || !dcChat.canVideochat()) {
menu.findItem(R.id.menu_videochat_invite).setVisible(false);
}

5
src/org/thoughtcrime/securesms/util/Prefs.java
View file

@ -52,7 +52,6 @@ public class Prefs {
public static final String DOZE_ASKED_DIRECTLY = "pref_doze_asked_directly";
private static final String IN_THREAD_NOTIFICATION_PREF = "pref_key_inthread_notifications";
public static final String MESSAGE_BODY_TEXT_SIZE_PREF = "pref_message_body_text_size";
public static final String EPHEMERAL_MESSAGES_PREF = "pref_ephemeral_messages";
public static final String NOTIFICATION_PRIVACY_PREF = "pref_notification_privacy";
public static final String NOTIFICATION_PRIORITY_PREF = "pref_notification_priority";
@ -188,10 +187,6 @@ public class Prefs {
}
}
public static boolean isEphemeralMessagesEnabled(Context context) {
return getBooleanPreference(context, EPHEMERAL_MESSAGES_PREF, false);
}
// ringtone
public static @NonNull Uri getNotificationRingtone(Context context) {