Skip to content
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

CCDWA-113 Show shielding notice once per app start #338

Merged
merged 1 commit into from
Jun 25, 2024
+6 −30
Merged

CCDWA-113 Show shielding notice once per app start #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 6 additions & 12 deletions app/src/main/java/com/concordium/wallet/core/authentication/Session.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ class Session(context: Context) {
val isLoggedIn: LiveData<Boolean>
get() = _isLoggedIn

// The notice must be shown once per app start.
private var isShieldingNoticeShown = false

fun setHasShowRewards(id: Int, value: Boolean) {
filterPreferences.setHasShowRewards(id, value)
}
Expand All @@ -39,12 +42,11 @@ class Session(context: Context) {
}

fun shieldingNoticeShown() {
authPreferences.setShieldingNoticeShown(true)
isShieldingNoticeShown = true
}

fun isShieldingNoticeShown():Boolean {
return authPreferences.getShieldingNoticeShown()
}
fun isShieldingNoticeShown(): Boolean =
isShieldingNoticeShown

fun hasSetupPassword(passcodeUsed: Boolean = false) {
_isLoggedIn.value = true
Expand Down Expand Up @@ -118,14 +120,6 @@ class Session(context: Context) {
return authPreferences.setShieldingEnabled(accountAddress, value)
}

fun isShieldedWarningDismissed(accountAddress: String): Boolean {
return authPreferences.isShieldedWarningDismissed(accountAddress)
}

fun setShieldedWarningDismissed(accountAddress: String, value: Boolean) {
return authPreferences.setShieldedWarningDismissed(accountAddress, value)
}

init {
authPreferences = AuthPreferences(context)
hasSetupPassword = authPreferences.getHasSetupUser()
Expand Down
18 changes: 0 additions & 18 deletions app/src/main/java/com/concordium/wallet/data/preferences/AuthPreferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,9 @@ class AuthPreferences(val context: Context) :
const val PREFKEY_BIOMETRIC_KEY = "PREFKEY_BIOMETRIC_KEY"
const val PREFKEY_TERMS_HASHED = "PREFKEY_TERMS_HASHED"
const val PREFKEY_SHIELDING_ENABLED_ = "PREFKEY_SHIELDING_ENABLED_"
const val PREFKEY_SHIELDED_WARNING_DISMISSED_ = "PREFKEY_SHIELDED_WARNING_DISMISSED_"
const val PREFKEY_IDENTITY_PENDING_ACKNOWLEDGED = "PREFKEY_IDENTITY_PENDING_ACKNOWLEDGED_"
const val SEED_PHRASE = "SEED_PHRASE"
const val SEED_PHRASE_ENCRYPTED = "SEED_PHRASE_ENCRYPTED"
const val PREFKEY_SHIELDING_NOTICE_SHOWN = "SHIELDING_NOTICE_SHOWN"
}

fun setShieldingNoticeShown(value: Boolean) {
setBoolean(PREFKEY_SHIELDING_NOTICE_SHOWN, value)
}

fun getShieldingNoticeShown(): Boolean {
return getBoolean(PREFKEY_SHIELDING_NOTICE_SHOWN, false)
}

fun setHasSetupUser(value: Boolean) {
Expand Down Expand Up @@ -135,14 +125,6 @@ class AuthPreferences(val context: Context) :
return setBoolean(PREFKEY_SHIELDING_ENABLED_ + accountAddress, value)
}

fun isShieldedWarningDismissed(accountAddress: String): Boolean {
return getBoolean(PREFKEY_SHIELDED_WARNING_DISMISSED_ + accountAddress, false)
}

fun setShieldedWarningDismissed(accountAddress: String, value: Boolean) {
return setBoolean(PREFKEY_SHIELDED_WARNING_DISMISSED_ + accountAddress, value)
}

fun setIdentityPendingWarningAcknowledged(id: Int) {
return setBoolean(PREFKEY_IDENTITY_PENDING_ACKNOWLEDGED + id, true)
}
Expand Down
Loading