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

Merge branch 'dev' into strings-squashed

Browse Source
This commit is contained in:
alansley
2024-08-27 08:19:53 +10:00
parent 3c576053a3 1393335121
commit 4d7e4b9e2c
30 changed files with 809 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
View File

@@ -2,7 +2,6 @@
package org.session.libsession.snode
import android.os.Build
import com.goterl.lazysodium.exceptions.SodiumException
import com.goterl.lazysodium.interfaces.GenericHash
import com.goterl.lazysodium.interfaces.PwHash
@@ -76,9 +75,7 @@ object SnodeAPI {
// Use port 4433 to enforce pinned certificates
private val seedNodePort = 4443
private const val useTestnet = false
private val seedNodePool = if (useTestnet) setOf(
private val seedNodePool = if (SnodeModule.shared.useTestNet) setOf(
"http://public.loki.foundation:38157"
) else setOf(
"https://seed1.getsession.org:$seedNodePort",

8
libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt
View File

@@ -3,16 +3,18 @@ package org.session.libsession.snode
import org.session.libsignal.database.LokiAPIDatabaseProtocol
import org.session.libsignal.utilities.Broadcaster
class SnodeModule(val storage: LokiAPIDatabaseProtocol, val broadcaster: Broadcaster) {
class SnodeModule(
val storage: LokiAPIDatabaseProtocol, val broadcaster: Broadcaster, val useTestNet: Boolean
) {
companion object {
lateinit var shared: SnodeModule
val isInitialized: Boolean get() = Companion::shared.isInitialized
fun configure(storage: LokiAPIDatabaseProtocol, broadcaster: Broadcaster) {
fun configure(storage: LokiAPIDatabaseProtocol, broadcaster: Broadcaster, useTestNet: Boolean) {
if (isInitialized) { return }
shared = SnodeModule(storage, broadcaster)
shared = SnodeModule(storage, broadcaster, useTestNet)
}
}
}

5
libsession/src/main/java/org/session/libsession/utilities/Environment.kt Normal file
View File

@@ -0,0 +1,5 @@
package org.session.libsession.utilities
enum class Environment(val label: String) {
MAIN_NET("Mainnet"), TEST_NET("Testnet")
}

1
libsession/src/main/java/org/session/libsession/utilities/NonTranslatableStringConstants.kt
View File

@@ -5,6 +5,7 @@ object NonTranslatableStringConstants {
const val APP_NAME = "Session"
const val ARBISCAN = "Arbiscan"
const val ARBITRUM = "Arbitrum"
const val DEBUG_MENU = "Debug Menu"
const val ETHEREUM = "Ethereum"
const val NETWORK_NAME = "Session Network"
const val TOKEN_NAME_LONG = "Session Token"

15
libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
View File

@@ -18,6 +18,7 @@ import org.session.libsession.utilities.TextSecurePreferences.Companion.AUTOPLAY
import org.session.libsession.utilities.TextSecurePreferences.Companion.CALL_NOTIFICATIONS_ENABLED
import org.session.libsession.utilities.TextSecurePreferences.Companion.CLASSIC_DARK
import org.session.libsession.utilities.TextSecurePreferences.Companion.CLASSIC_LIGHT
import org.session.libsession.utilities.TextSecurePreferences.Companion.ENVIRONMENT
import org.session.libsession.utilities.TextSecurePreferences.Companion.FOLLOW_SYSTEM_SETTINGS
import org.session.libsession.utilities.TextSecurePreferences.Companion.HIDE_PASSWORD
import org.session.libsession.utilities.TextSecurePreferences.Companion.LAST_VACUUM_TIME
@@ -190,6 +191,8 @@ interface TextSecurePreferences {
fun setHidePassword(value: Boolean)
fun getLastVersionCheck(): Long
fun setLastVersionCheck()
fun getEnvironment(): Environment
fun setEnvironment(value: Environment)
companion object {
val TAG = TextSecurePreferences::class.simpleName
@@ -277,6 +280,7 @@ interface TextSecurePreferences {
const val FINGERPRINT_KEY_GENERATED = "fingerprint_key_generated"
const val SELECTED_ACCENT_COLOR = "selected_accent_color"
const val LAST_VERSION_CHECK = "pref_last_version_check"
const val ENVIRONMENT = "debug_environment"
const val HAS_RECEIVED_LEGACY_CONFIG = "has_received_legacy_config"
const val HAS_FORCED_NEW_CONFIG = "has_forced_new_config"
@@ -1572,6 +1576,17 @@ class AppTextSecurePreferences @Inject constructor(
setLongPreference(LAST_VERSION_CHECK, System.currentTimeMillis())
}
override fun getEnvironment(): Environment {
val environment = getStringPreference(ENVIRONMENT, null)
return if (environment != null) {
Environment.valueOf(environment)
} else Environment.MAIN_NET
}
override fun setEnvironment(value: Environment) {
setStringPreference(ENVIRONMENT, value.name)
}
override fun setShownCallNotification(): Boolean {
val previousValue = getBooleanPreference(SHOWN_CALL_NOTIFICATION, false)
if (previousValue) return false