Skip to content

Fix incorrect PreferenceStorage API usage in HomeViewModel and ConversationActivityV2 #1999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 2 commits into from
Closed

Fix incorrect PreferenceStorage API usage in HomeViewModel and ConversationActivityV2 #1999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fd61cb
Initial plan
Copilot Feb 24, 2026
7d59e4e
Fix incorrect API usage for PushPreferences and NotificationPreferences
Copilot Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ import org.session.libsession.utilities.StringSubstitutionConstants.GROUP_NAME_K
import org.session.libsession.utilities.StringSubstitutionConstants.NAME_KEY
import org.session.libsession.utilities.Stub
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsession.utilities.TextSecurePreferences.Companion.CALL_NOTIFICATIONS_ENABLED
import org.thoughtcrime.securesms.preferences.MessagingPreferences
import org.thoughtcrime.securesms.preferences.NotificationPreferences
import org.thoughtcrime.securesms.preferences.PreferenceStorage
Expand Down Expand Up @@ -1730,7 +1729,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
button(R.string.sessionSettings, R.string.AccessibilityId_sessionSettings) {
val intent = Intent(context, PrivacySettingsActivity::class.java)
// allow the screen to auto scroll to the appropriate toggle
intent.putExtra(PrivacySettingsActivity.SCROLL_AND_TOGGLE_KEY, CALL_NOTIFICATIONS_ENABLED)
intent.putExtra(PrivacySettingsActivity.SCROLL_AND_TOGGLE_KEY, NotificationPreferences.CALL_NOTIFICATIONS_ENABLED.name)
context.startActivity(intent)
}
cancelButton()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class HomeViewModel @Inject constructor(
init {
// check for white list status in case of slow mode
if(!prefStorage[SystemPreferences.HAS_CHECKED_DOZE_WHITELIST] // the user has not yet seen the dialog
&& !prefStorage[PushPreferences.isPushEnabled(TextSecurePreferences.pushSuffix)] // the user is in slow mode
&& !prefStorage[PushPreferences.IS_PUSH_ENABLED] // the user is in slow mode
&& !context.isWhitelistedFromDoze() // the user isn't yet whitelisted
){
prefStorage[SystemPreferences.HAS_CHECKED_DOZE_WHITELIST] = true
Expand Down
Loading