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

Made view-once a non-sticky setting.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-01-07 16:18:07 -05:00
parent d2d450aff2
commit c346f32762
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
View File

@ -194,7 +194,7 @@ class MediaSendViewModel extends ViewModel {
buttonState = (recipient != null) ? ButtonState.SEND : ButtonState.CONTINUE; buttonState = (recipient != null) ? ButtonState.SEND : ButtonState.CONTINUE;
if (viewOnceState == ViewOnceState.GONE && viewOnceSupported()) { if (viewOnceState == ViewOnceState.GONE && viewOnceSupported()) {
viewOnceState = TextSecurePreferences.isViewOnceMessageEnabled(application) ? ViewOnceState.ENABLED : ViewOnceState.DISABLED; viewOnceState = ViewOnceState.DISABLED;
showViewOnceTooltipIfNecessary(viewOnceState); showViewOnceTooltipIfNecessary(viewOnceState);
} else if (!viewOnceSupported()) { } else if (!viewOnceSupported()) {
viewOnceState = ViewOnceState.GONE; viewOnceState = ViewOnceState.GONE;
@ -272,9 +272,6 @@ class MediaSendViewModel extends ViewModel {
.toList(); .toList();
selectedMedia.setValue(uncaptioned); selectedMedia.setValue(uncaptioned);
TextSecurePreferences.setIsViewOnceMessageEnabled(application, viewOnceState == ViewOnceState.ENABLED);
hudState.setValue(buildHudState()); hudState.setValue(buildHudState());
} }

9
app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View File

@ -200,7 +200,6 @@ public class TextSecurePreferences {
private static final String MEDIA_KEYBOARD_MODE = "pref_media_keyboard_mode"; private static final String MEDIA_KEYBOARD_MODE = "pref_media_keyboard_mode";
private static final String VIEW_ONCE_DEFAULT = "pref_revealable_message_default";
private static final String VIEW_ONCE_TOOLTIP_SEEN = "pref_revealable_message_tooltip_seen"; private static final String VIEW_ONCE_TOOLTIP_SEEN = "pref_revealable_message_tooltip_seen";
private static final String SEEN_CAMERA_FIRST_TOOLTIP = "pref_seen_camera_first_tooltip"; private static final String SEEN_CAMERA_FIRST_TOOLTIP = "pref_seen_camera_first_tooltip";
@ -1276,14 +1275,6 @@ public class TextSecurePreferences {
return MediaKeyboardMode.valueOf(name); return MediaKeyboardMode.valueOf(name);
} }
public static void setIsViewOnceMessageEnabled(Context context, boolean value) {
setBooleanPreference(context, VIEW_ONCE_DEFAULT, value);
}
public static boolean isViewOnceMessageEnabled(Context context) {
return getBooleanPreference(context, VIEW_ONCE_DEFAULT, false);
}
public static void setHasSeenViewOnceTooltip(Context context, boolean value) { public static void setHasSeenViewOnceTooltip(Context context, boolean value) {
setBooleanPreference(context, VIEW_ONCE_TOOLTIP_SEEN, value); setBooleanPreference(context, VIEW_ONCE_TOOLTIP_SEEN, value);
} }