External node QR scanning#230

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

Merged
ovitrif merged 18 commits into from
Jul 15, 2025
Merged

External node QR scanning #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a26b38b
chore: cleanup unused deps from BlocktankNotificationsService
ovitrif Jul 14, 2025
cee1192
feat: custom http logging disabled
ovitrif Jul 14, 2025
7c23078
chore: upgrade agp
ovitrif Jul 14, 2025
4304acc
refactor: remove redundant app shapes
ovitrif Jul 14, 2025
bfc3e02
refactor: TextInput style and preview
ovitrif Jul 14, 2025
886d057
fix: TextInput font size
ovitrif Jul 14, 2025
d7cf06a
refactor: use TextInput component
ovitrif Jul 14, 2025
9cdf036
fix: use non-deprecated clipboard manager
ovitrif Jul 14, 2025
b40d1c0
feat: nav to scanner
ovitrif Jul 14, 2025
5e21f25
feat: on scan node uri nav to external connection
ovitrif Jul 14, 2025
153bab5
refactor: rename to navigateToScanner
ovitrif Jul 14, 2025
de0eec1
refactor: move popBackStack to inner handler
ovitrif Jul 14, 2025
590b820
refactor: remove redundant ResourceProvider
ovitrif Jul 14, 2025
dbb1943
fix: navigate home on close tap from funding screens
ovitrif Jul 14, 2025
8af57e5
fix: prevent nav back to same screen after scan
ovitrif Jul 14, 2025
942879a
feat: add screen transitions to transfer screens
ovitrif Jul 14, 2025
efcd0af
revert: fix: prevent nav back to same screen after scan
ovitrif Jul 14, 2025
0fec0ee
fix: node scan navigation
ovitrif Jul 14, 2025
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
39 changes: 27 additions & 12 deletions app/src/main/java/to/bitkit/di/HttpModule.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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)
Expand All@@ -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)
}
}
3 changes: 2 additions & 1 deletion app/src/main/java/to/bitkit/ext/Context.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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)
)
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/to/bitkit/models/LnPeer.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"))
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -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) {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
External node QR scanning#230

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

 Merged

ovitrif
merged 18 commits into

from

Jul 15, 2025
 Merged


External node QR scanning
#230
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
a26b38b

chore: cleanup unused deps from BlocktankNotificationsService


ovitrif Jul 14, 2025
cee1192

feat: custom http logging disabled


ovitrif Jul 14, 2025
7c23078

chore: upgrade agp


ovitrif Jul 14, 2025
4304acc

refactor: remove redundant app shapes


ovitrif Jul 14, 2025
bfc3e02

refactor: TextInput style and preview


ovitrif Jul 14, 2025
886d057

fix: TextInput font size


ovitrif Jul 14, 2025
d7cf06a

refactor: use TextInput component


ovitrif Jul 14, 2025
9cdf036

fix: use non-deprecated clipboard manager


ovitrif Jul 14, 2025
b40d1c0

feat: nav to scanner


ovitrif Jul 14, 2025
5e21f25

feat: on scan node uri nav to external connection


ovitrif Jul 14, 2025
153bab5

refactor: rename to navigateToScanner


ovitrif Jul 14, 2025
de0eec1

refactor: move popBackStack to inner handler


ovitrif Jul 14, 2025
590b820

refactor: remove redundant ResourceProvider


ovitrif Jul 14, 2025
dbb1943

fix: navigate home on close tap from funding screens


ovitrif Jul 14, 2025
8af57e5

fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
942879a

feat: add screen transitions to transfer screens


ovitrif Jul 14, 2025
efcd0af

revert: fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
0fec0ee

fix: node scan navigation


ovitrif Jul 14, 2025

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


39 changes: 27 additions & 12 deletions
app/src/main/java/to/bitkit/di/HttpModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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)
Expand All@@ -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)
 }
 }

3 changes: 2 additions & 1 deletion
app/src/main/java/to/bitkit/ext/Context.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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)
 )
Expand Down

10 changes: 5 additions & 5 deletions
app/src/main/java/to/bitkit/models/LnPeer.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"))
Expand Down

3 changes: 0 additions & 3 deletions
app/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -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) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
External node QR scanning#230

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

 Merged

ovitrif
merged 18 commits into

from

Jul 15, 2025
 Merged


External node QR scanning
#230
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
a26b38b

chore: cleanup unused deps from BlocktankNotificationsService


ovitrif Jul 14, 2025
cee1192

feat: custom http logging disabled


ovitrif Jul 14, 2025
7c23078

chore: upgrade agp


ovitrif Jul 14, 2025
4304acc

refactor: remove redundant app shapes


ovitrif Jul 14, 2025
bfc3e02

refactor: TextInput style and preview


ovitrif Jul 14, 2025
886d057

fix: TextInput font size


ovitrif Jul 14, 2025
d7cf06a

refactor: use TextInput component


ovitrif Jul 14, 2025
9cdf036

fix: use non-deprecated clipboard manager


ovitrif Jul 14, 2025
b40d1c0

feat: nav to scanner


ovitrif Jul 14, 2025
5e21f25

feat: on scan node uri nav to external connection


ovitrif Jul 14, 2025
153bab5

refactor: rename to navigateToScanner


ovitrif Jul 14, 2025
de0eec1

refactor: move popBackStack to inner handler


ovitrif Jul 14, 2025
590b820

refactor: remove redundant ResourceProvider


ovitrif Jul 14, 2025
dbb1943

fix: navigate home on close tap from funding screens


ovitrif Jul 14, 2025
8af57e5

fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
942879a

feat: add screen transitions to transfer screens


ovitrif Jul 14, 2025
efcd0af

revert: fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
0fec0ee

fix: node scan navigation


ovitrif Jul 14, 2025

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


39 changes: 27 additions & 12 deletions
app/src/main/java/to/bitkit/di/HttpModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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)
Expand All@@ -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)
 }
 }

3 changes: 2 additions & 1 deletion
app/src/main/java/to/bitkit/ext/Context.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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)
 )
Expand Down

10 changes: 5 additions & 5 deletions
app/src/main/java/to/bitkit/models/LnPeer.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"))
Expand Down

3 changes: 0 additions & 3 deletions
app/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -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) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
External node QR scanning#230

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

 Merged

ovitrif
merged 18 commits into

from

Jul 15, 2025
 Merged


External node QR scanning
#230
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
a26b38b

chore: cleanup unused deps from BlocktankNotificationsService


ovitrif Jul 14, 2025
cee1192

feat: custom http logging disabled


ovitrif Jul 14, 2025
7c23078

chore: upgrade agp


ovitrif Jul 14, 2025
4304acc

refactor: remove redundant app shapes


ovitrif Jul 14, 2025
bfc3e02

refactor: TextInput style and preview


ovitrif Jul 14, 2025
886d057

fix: TextInput font size


ovitrif Jul 14, 2025
d7cf06a

refactor: use TextInput component


ovitrif Jul 14, 2025
9cdf036

fix: use non-deprecated clipboard manager


ovitrif Jul 14, 2025
b40d1c0

feat: nav to scanner


ovitrif Jul 14, 2025
5e21f25

feat: on scan node uri nav to external connection


ovitrif Jul 14, 2025
153bab5

refactor: rename to navigateToScanner


ovitrif Jul 14, 2025
de0eec1

refactor: move popBackStack to inner handler


ovitrif Jul 14, 2025
590b820

refactor: remove redundant ResourceProvider


ovitrif Jul 14, 2025
dbb1943

fix: navigate home on close tap from funding screens


ovitrif Jul 14, 2025
8af57e5

fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
942879a

feat: add screen transitions to transfer screens


ovitrif Jul 14, 2025
efcd0af

revert: fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
0fec0ee

fix: node scan navigation


ovitrif Jul 14, 2025

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


39 changes: 27 additions & 12 deletions
app/src/main/java/to/bitkit/di/HttpModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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)
Expand All@@ -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)
 }
 }

3 changes: 2 additions & 1 deletion
app/src/main/java/to/bitkit/ext/Context.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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)
 )
Expand Down

10 changes: 5 additions & 5 deletions
app/src/main/java/to/bitkit/models/LnPeer.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"))
Expand Down

3 changes: 0 additions & 3 deletions
app/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -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) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
External node QR scanning#230

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

 Merged

ovitrif
merged 18 commits into

from

Jul 15, 2025
 Merged


External node QR scanning
#230
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
a26b38b

chore: cleanup unused deps from BlocktankNotificationsService


ovitrif Jul 14, 2025
cee1192

feat: custom http logging disabled


ovitrif Jul 14, 2025
7c23078

chore: upgrade agp


ovitrif Jul 14, 2025
4304acc

refactor: remove redundant app shapes


ovitrif Jul 14, 2025
bfc3e02

refactor: TextInput style and preview


ovitrif Jul 14, 2025
886d057

fix: TextInput font size


ovitrif Jul 14, 2025
d7cf06a

refactor: use TextInput component


ovitrif Jul 14, 2025
9cdf036

fix: use non-deprecated clipboard manager


ovitrif Jul 14, 2025
b40d1c0

feat: nav to scanner


ovitrif Jul 14, 2025
5e21f25

feat: on scan node uri nav to external connection


ovitrif Jul 14, 2025
153bab5

refactor: rename to navigateToScanner


ovitrif Jul 14, 2025
de0eec1

refactor: move popBackStack to inner handler


ovitrif Jul 14, 2025
590b820

refactor: remove redundant ResourceProvider


ovitrif Jul 14, 2025
dbb1943

fix: navigate home on close tap from funding screens


ovitrif Jul 14, 2025
8af57e5

fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
942879a

feat: add screen transitions to transfer screens


ovitrif Jul 14, 2025
efcd0af

revert: fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
0fec0ee

fix: node scan navigation


ovitrif Jul 14, 2025

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


39 changes: 27 additions & 12 deletions
app/src/main/java/to/bitkit/di/HttpModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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)
Expand All@@ -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)
 }
 }

3 changes: 2 additions & 1 deletion
app/src/main/java/to/bitkit/ext/Context.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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)
 )
Expand Down

10 changes: 5 additions & 5 deletions
app/src/main/java/to/bitkit/models/LnPeer.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"))
Expand Down

3 changes: 0 additions & 3 deletions
app/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -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) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
External node QR scanning#230

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

 Merged

ovitrif
merged 18 commits into

from

Jul 15, 2025
 Merged


External node QR scanning
#230
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
a26b38b

chore: cleanup unused deps from BlocktankNotificationsService


ovitrif Jul 14, 2025
cee1192

feat: custom http logging disabled


ovitrif Jul 14, 2025
7c23078

chore: upgrade agp


ovitrif Jul 14, 2025
4304acc

refactor: remove redundant app shapes


ovitrif Jul 14, 2025
bfc3e02

refactor: TextInput style and preview


ovitrif Jul 14, 2025
886d057

fix: TextInput font size


ovitrif Jul 14, 2025
d7cf06a

refactor: use TextInput component


ovitrif Jul 14, 2025
9cdf036

fix: use non-deprecated clipboard manager


ovitrif Jul 14, 2025
b40d1c0

feat: nav to scanner


ovitrif Jul 14, 2025
5e21f25

feat: on scan node uri nav to external connection


ovitrif Jul 14, 2025
153bab5

refactor: rename to navigateToScanner


ovitrif Jul 14, 2025
de0eec1

refactor: move popBackStack to inner handler


ovitrif Jul 14, 2025
590b820

refactor: remove redundant ResourceProvider


ovitrif Jul 14, 2025
dbb1943

fix: navigate home on close tap from funding screens


ovitrif Jul 14, 2025
8af57e5

fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
942879a

feat: add screen transitions to transfer screens


ovitrif Jul 14, 2025
efcd0af

revert: fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
0fec0ee

fix: node scan navigation


ovitrif Jul 14, 2025

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


39 changes: 27 additions & 12 deletions
app/src/main/java/to/bitkit/di/HttpModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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)
Expand All@@ -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)
 }
 }

3 changes: 2 additions & 1 deletion
app/src/main/java/to/bitkit/ext/Context.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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)
 )
Expand Down

10 changes: 5 additions & 5 deletions
app/src/main/java/to/bitkit/models/LnPeer.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"))
Expand Down

3 changes: 0 additions & 3 deletions
app/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -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) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
External node QR scanning#230

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

 Merged

ovitrif
merged 18 commits into

from

Jul 15, 2025
 Merged


External node QR scanning
#230
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
a26b38b

chore: cleanup unused deps from BlocktankNotificationsService


ovitrif Jul 14, 2025
cee1192

feat: custom http logging disabled


ovitrif Jul 14, 2025
7c23078

chore: upgrade agp


ovitrif Jul 14, 2025
4304acc

refactor: remove redundant app shapes


ovitrif Jul 14, 2025
bfc3e02

refactor: TextInput style and preview


ovitrif Jul 14, 2025
886d057

fix: TextInput font size


ovitrif Jul 14, 2025
d7cf06a

refactor: use TextInput component


ovitrif Jul 14, 2025
9cdf036

fix: use non-deprecated clipboard manager


ovitrif Jul 14, 2025
b40d1c0

feat: nav to scanner


ovitrif Jul 14, 2025
5e21f25

feat: on scan node uri nav to external connection


ovitrif Jul 14, 2025
153bab5

refactor: rename to navigateToScanner


ovitrif Jul 14, 2025
de0eec1

refactor: move popBackStack to inner handler


ovitrif Jul 14, 2025
590b820

refactor: remove redundant ResourceProvider


ovitrif Jul 14, 2025
dbb1943

fix: navigate home on close tap from funding screens


ovitrif Jul 14, 2025
8af57e5

fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
942879a

feat: add screen transitions to transfer screens


ovitrif Jul 14, 2025
efcd0af

revert: fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
0fec0ee

fix: node scan navigation


ovitrif Jul 14, 2025

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


39 changes: 27 additions & 12 deletions
app/src/main/java/to/bitkit/di/HttpModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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)
Expand All@@ -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)
 }
 }

3 changes: 2 additions & 1 deletion
app/src/main/java/to/bitkit/ext/Context.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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)
 )
Expand Down

10 changes: 5 additions & 5 deletions
app/src/main/java/to/bitkit/models/LnPeer.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"))
Expand Down

3 changes: 0 additions & 3 deletions
app/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -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) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
External node QR scanning#230

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

 Merged

ovitrif
merged 18 commits into

from

Jul 15, 2025
 Merged


External node QR scanning
#230
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
a26b38b

chore: cleanup unused deps from BlocktankNotificationsService


ovitrif Jul 14, 2025
cee1192

feat: custom http logging disabled


ovitrif Jul 14, 2025
7c23078

chore: upgrade agp


ovitrif Jul 14, 2025
4304acc

refactor: remove redundant app shapes


ovitrif Jul 14, 2025
bfc3e02

refactor: TextInput style and preview


ovitrif Jul 14, 2025
886d057

fix: TextInput font size


ovitrif Jul 14, 2025
d7cf06a

refactor: use TextInput component


ovitrif Jul 14, 2025
9cdf036

fix: use non-deprecated clipboard manager


ovitrif Jul 14, 2025
b40d1c0

feat: nav to scanner


ovitrif Jul 14, 2025
5e21f25

feat: on scan node uri nav to external connection


ovitrif Jul 14, 2025
153bab5

refactor: rename to navigateToScanner


ovitrif Jul 14, 2025
de0eec1

refactor: move popBackStack to inner handler


ovitrif Jul 14, 2025
590b820

refactor: remove redundant ResourceProvider


ovitrif Jul 14, 2025
dbb1943

fix: navigate home on close tap from funding screens


ovitrif Jul 14, 2025
8af57e5

fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
942879a

feat: add screen transitions to transfer screens


ovitrif Jul 14, 2025
efcd0af

revert: fix: prevent nav back to same screen after scan


ovitrif Jul 14, 2025
0fec0ee

fix: node scan navigation


ovitrif Jul 14, 2025

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


39 changes: 27 additions & 12 deletions
app/src/main/java/to/bitkit/di/HttpModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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)
Expand All@@ -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)
 }
 }

3 changes: 2 additions & 1 deletion
app/src/main/java/to/bitkit/ext/Context.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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)
 )
Expand Down

10 changes: 5 additions & 5 deletions
app/src/main/java/to/bitkit/models/LnPeer.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"))
Expand Down

3 changes: 0 additions & 3 deletions
app/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -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) {
Expand Down
Loading