AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some minor refactoring

Browse source
This commit is contained in:
albexk 2023-12-14 18:01:55 +03:00
parent 0cabf60dc4
commit 95d1440d6f
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/android/src/org/amnezia/vpn/Prefs.kt
View file

@ -8,7 +8,7 @@ import org.amnezia.vpn.util.Log
private const val TAG = "Prefs" private const val TAG = "Prefs"
private const val PREFS_FILE = "org.amnezia.vpn.prefs" private const val PREFS_FILE = "org.amnezia.vpn.prefs"
private const val SECURE_PREFS_FILE = PREFS_FILE + ".secure" private const val SECURE_PREFS_FILE = "$PREFS_FILE.secure"
object Prefs { object Prefs {
fun get(context: Context, appContext: Context = context.applicationContext): SharedPreferences = fun get(context: Context, appContext: Context = context.applicationContext): SharedPreferences =
@ -19,7 +19,7 @@ object Prefs {
MasterKey(appContext) MasterKey(appContext)
) )
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Getting Encryption Storage failed, plaintext fallback") Log.e(TAG, "Getting Encryption Storage failed: ${e.message}, plaintext fallback")
appContext.getSharedPreferences(PREFS_FILE, Context.MODE_PRIVATE) appContext.getSharedPreferences(PREFS_FILE, Context.MODE_PRIVATE)
} }
} }

4
client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
View file

@ -104,7 +104,7 @@ open class Wireguard : Protocol() {
parseInetAddress(dns.trim()) parseInetAddress(dns.trim())
}?.forEach(::addDnsServer) }?.forEach(::addDnsServer)
val defRoutes = listOf( val defRoutes = hashSetOf(
InetNetwork("0.0.0.0", 0), InetNetwork("0.0.0.0", 0),
InetNetwork("::", 0) InetNetwork("::", 0)
) )
@ -113,7 +113,7 @@ open class Wireguard : Protocol() {
InetNetwork.parse(route.trim()) InetNetwork.parse(route.trim())
}?.forEach(routes::add) }?.forEach(routes::add)
// if the allowed IPs list contains at least one non-default route, disable global split tunneling // if the allowed IPs list contains at least one non-default route, disable global split tunneling
if (!routes.all { defRoutes.contains(it) }) disableSplitTunneling() if (routes.any { it !in defRoutes }) disableSplitTunneling()
addRoutes(routes) addRoutes(routes)
configData["MTU"]?.let { setMtu(it.toInt()) } configData["MTU"]?.let { setMtu(it.toInt()) }