External node QR scanning

app/src/main/java/to/bitkit/di/HttpModule.kt

@@ -6,18 +6,20 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.HttpTimeoutConfig
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.plugins.defaultRequest
-import io.ktor.client.plugins.logging.ANDROID
 import io.ktor.client.plugins.logging.LogLevel
-import io.ktor.client.plugins.logging.Logger
 import io.ktor.client.plugins.logging.Logging
+import io.ktor.client.plugins.logging.LoggingConfig
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.json.Json
+import to.bitkit.utils.Logger
 import javax.inject.Qualifier
 import javax.inject.Singleton
+import io.ktor.client.plugins.logging.Logger as KtorLogger
 
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
@@ -26,18 +28,16 @@ annotation class ProtoClient
 @Module
 @InstallIn(SingletonComponent::class)
 object HttpModule {
+
     @Provides
     @Singleton
     fun provideHttpClient(json: Json): HttpClient {
         return HttpClient {
             install(HttpTimeout) {
-                requestTimeoutMillis = 60_000
-                connectTimeoutMillis = 30_000
-                socketTimeoutMillis = 30_000
+                this@install.defaultTimeoutConfig()
             }
             install(Logging) {
-                logger = Logger.ANDROID
-                level = LogLevel.INFO
+                this@install.defaultLoggingConfig()
             }
             install(ContentNegotiation) {
                 json(json = json)
@@ -54,14 +54,29 @@ object HttpModule {
     fun provideProtoHttpClient(): HttpClient {
         return HttpClient {
             install(HttpTimeout) {
-                requestTimeoutMillis = 60_000
-                connectTimeoutMillis = 30_000
-                socketTimeoutMillis = 30_000
+                this@install.defaultTimeoutConfig()
             }
             install(Logging) {
-                logger = Logger.ANDROID
-                level = LogLevel.INFO
+                this@install.defaultLoggingConfig()
             }
         }
     }
+
+    private fun HttpTimeoutConfig.defaultTimeoutConfig() {
+        requestTimeoutMillis = 60_000
+        connectTimeoutMillis = 30_000
+        socketTimeoutMillis = 30_000
+    }
+
+    private fun LoggingConfig.defaultLoggingConfig() {
+        logger = KtorLogger.APP
+        level = LogLevel.NONE
+    }
 }
+
+private val KtorLogger.Companion.APP
+    get() = object : KtorLogger {
+        override fun log(message: String) {
+            Logger.debug(message)
+        }
+    }

app/src/main/java/to/bitkit/ext/Context.kt

@@ -12,6 +12,7 @@ import android.content.ContextWrapper
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
+import to.bitkit.R
 import to.bitkit.utils.Logger
 import java.io.File
 import java.io.FileOutputStream
@@ -63,7 +64,7 @@ fun Context.findActivity(): Activity? =
     }
 
 // Clipboard
-fun Context.setClipboardText(text: String, label: String = "") {
+fun Context.setClipboardText(text: String, label: String = getString(R.string.app_name)) {
     this.clipboardManager.setPrimaryClip(
         ClipData.newPlainText(label, text)
     )

app/src/main/java/to/bitkit/models/LnPeer.kt

@@ -26,15 +26,15 @@ data class LnPeer(
             address = address,
         )
 
-        fun parseUri(string: String): Result<LnPeer> {
-            val uri = string.split("@")
-            val nodeId = uri[0]
+        fun parseUri(uriString: String): Result<LnPeer> {
+            val uriComponents = uriString.split("@")
+            val nodeId = uriComponents[0]
 
-            if (uri.size != 2) {
+            if (uriComponents.size != 2) {
                 return Result.failure(Exception("Invalid peer uri"))
             }
 
-            val address = uri[1].split(":")
+            val address = uriComponents[1].split(":")
 
             if (address.size < 2) {
                 return Result.failure(Exception("Invalid peer uri"))

app/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt

@@ -1,10 +1,8 @@
 package to.bitkit.services
 
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
 import to.bitkit.async.ServiceQueue
-import to.bitkit.data.SettingsStore
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.data.keychain.Keychain.Key
 import to.bitkit.di.BgDispatcher
@@ -24,7 +22,6 @@ class BlocktankNotificationsService @Inject constructor(
     private val lightningService: LightningService,
     private val keychain: Keychain,
     private val crypto: Crypto,
-    private val settingsStore: SettingsStore,
 ) {
 
     suspend fun registerDevice(deviceToken: String) = withContext(bgDispatcher) {