laantungir/Amber
1
0
Fork 0
mirror of https://github.com/greenart7c3/Amber.git synced 2026-10-06 03:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tor connection when using private ips

Browse Source
This commit is contained in:
greenart7c3
2024-10-30 09:04:18 -03:00
parent efde0f7055
commit 5c2812ab26
2 changed files with 70 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/NostrSigner.kt
+24 -2
View File
@@ -131,7 +131,7 @@ class NostrSigner : Application() {
setupInfo.url,
setupInfo.read,
setupInfo.write,
useProxy,
if (isPrivateIp(setupInfo.url)) false else useProxy,
setupInfo.feedTypes,
),
)
@@ -145,12 +145,34 @@ class NostrSigner : Application() {
@Suppress("KotlinConstantConditions")
if (settings.notificationType == NotificationType.DIRECT && BuildConfig.FLAVOR != "offline") {
Client.reconnect(
savedRelays.map { RelaySetupInfoToConnect(it.url, useProxy, it.read, it.write, it.feedTypes) }.toTypedArray(),
savedRelays.map { RelaySetupInfoToConnect(it.url, if (isPrivateIp(it.url)) false else useProxy, it.read, it.write, it.feedTypes) }.toTypedArray(),
true,
)
}
}
fun isPrivateIp(url: String): Boolean {
return url.contains("127.0.0.1") ||
url.contains("localhost") ||
url.contains("192.168.") ||
url.contains("172.16.") ||
url.contains("172.17.") ||
url.contains("172.18.") ||
url.contains("172.19.") ||
url.contains("172.20.") ||
url.contains("172.21.") ||
url.contains("172.22.") ||
url.contains("172.23.") ||
url.contains("172.24.") ||
url.contains("172.25.") ||
url.contains("172.26.") ||
url.contains("172.27.") ||
url.contains("172.28.") ||
url.contains("172.29.") ||
url.contains("172.30.") ||
url.contains("172.31.")
}
private suspend fun checkIfRelaysAreConnected(tryAgain: Boolean = true) {
Log.d("NostrSigner", "Checking if relays are connected")
RelayPool.getAll().forEach { relay ->
app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt
+46 -2
View File
@@ -50,14 +50,17 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavController
import com.greenart7c3.nostrsigner.BuildConfig
import com.greenart7c3.nostrsigner.LocalPreferences
import com.greenart7c3.nostrsigner.NostrSigner
import com.greenart7c3.nostrsigner.R
import com.greenart7c3.nostrsigner.models.Account
import com.greenart7c3.nostrsigner.models.TimeUtils
import com.greenart7c3.nostrsigner.service.Nip11Retriever
import com.greenart7c3.nostrsigner.service.NotificationDataSource
import com.greenart7c3.nostrsigner.ui.AccountStateViewModel
import com.greenart7c3.nostrsigner.ui.CenterCircularProgressIndicator
import com.greenart7c3.nostrsigner.ui.NotificationType
import com.greenart7c3.nostrsigner.ui.components.AmberButton
import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
import com.vitorpamplona.ammolite.relays.Client
@@ -144,6 +147,18 @@ fun DefaultRelaysScreen(
defaultRelays = relays2,
)
LocalPreferences.saveSettingsToEncryptedStorage(NostrSigner.getInstance().settings)
scope.launch(Dispatchers.IO) {
@Suppress("KotlinConstantConditions")
if (NostrSigner.getInstance().settings.notificationType == NotificationType.DIRECT && BuildConfig.FLAVOR != "offline") {
NostrSigner.getInstance().checkForNewRelays()
NotificationDataSource.stop()
delay(2000)
NotificationDataSource.start()
isLoading.value = false
} else {
isLoading.value = false
}
}
},
)
}
@@ -169,10 +184,23 @@ fun DefaultRelaysScreen(
account,
context,
onDone = {
isLoading.value = true
NostrSigner.getInstance().settings = NostrSigner.getInstance().settings.copy(
defaultRelays = relays2,
)
LocalPreferences.saveSettingsToEncryptedStorage(NostrSigner.getInstance().settings)
scope.launch(Dispatchers.IO) {
@Suppress("KotlinConstantConditions")
if (NostrSigner.getInstance().settings.notificationType == NotificationType.DIRECT && BuildConfig.FLAVOR != "offline") {
NostrSigner.getInstance().checkForNewRelays()
NotificationDataSource.stop()
delay(2000)
NotificationDataSource.start()
isLoading.value = false
} else {
isLoading.value = false
}
}
},
)
}
@@ -202,11 +230,24 @@ fun DefaultRelaysScreen(
)
IconButton(
onClick = {
isLoading.value = true
relays2.removeAt(it)
NostrSigner.getInstance().settings = NostrSigner.getInstance().settings.copy(
defaultRelays = relays2,
)
LocalPreferences.saveSettingsToEncryptedStorage(NostrSigner.getInstance().settings)
scope.launch(Dispatchers.IO) {
@Suppress("KotlinConstantConditions")
if (NostrSigner.getInstance().settings.notificationType == NotificationType.DIRECT && BuildConfig.FLAVOR != "offline") {
NostrSigner.getInstance().checkForNewRelays()
NotificationDataSource.stop()
delay(2000)
NotificationDataSource.start()
isLoading.value = false
} else {
isLoading.value = false
}
}
},
) {
Icon(
@@ -238,8 +279,8 @@ suspend fun onAddRelay(
var addedWSS =
if (!url.startsWith("wss://") && !url.startsWith("ws://")) {
// TODO: How to identify relays on the local network?
val isLocalHost = url.contains("127.0.0.1") || url.contains("localhost")
if (url.endsWith(".onion") || url.endsWith(".onion/") || isLocalHost) {
val isPrivateIp = NostrSigner.getInstance().isPrivateIp(url)
if (url.endsWith(".onion") || url.endsWith(".onion/") || isPrivateIp) {
"ws://$url"
} else {
"wss://$url"
@@ -295,12 +336,15 @@ suspend fun onAddRelay(
it,
)
val isPrivateIp = NostrSigner.getInstance().isPrivateIp(addedWSS)
event?.let { signedEvent ->
val relay = Relay(
addedWSS,
read = true,
write = true,
activeTypes = setOf(),
forceProxy = if (isPrivateIp) false else account.useProxy,
)
RelayPool.addRelay(
relay,