Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ dependencies {
implementation(libs.ktor.server.cio)
implementation(libs.ktor.server.content.negotiation)
implementation(libs.ktor.serialization.kotlinx.json)
implementation(libs.ktor.client.content.negotiation)
implementation(libs.coil.compose)
implementation(libs.coil.network.ktor3)
implementation(libs.ktor.client.android)
Expand Down
9 changes: 1 addition & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
</intent>
</queries>

<queries>
<intent>
<action android:name="android.intent.action.VIEW" />
<data android:scheme="*" />
</intent>
</queries>


<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down Expand Up @@ -67,6 +59,7 @@
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
android:value="Local network server for managing deeplinks" />
</service>

</application>

</manifest>
23 changes: 21 additions & 2 deletions app/src/main/java/com/yogeshpaliyal/deepr/DeeprApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ import com.yogeshpaliyal.deepr.sync.SyncRepository
import com.yogeshpaliyal.deepr.sync.SyncRepositoryImpl
import com.yogeshpaliyal.deepr.viewmodel.AccountViewModel
import com.yogeshpaliyal.deepr.viewmodel.LocalServerViewModel
import com.yogeshpaliyal.deepr.viewmodel.TransferLinkLocalServerViewModel
import io.ktor.client.HttpClient
import io.ktor.client.engine.cio.CIO
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.serialization.kotlinx.json.json
import kotlinx.serialization.json.Json
import org.koin.android.ext.koin.androidContext
import org.koin.core.context.startKoin
import org.koin.core.module.dsl.viewModel
Expand Down Expand Up @@ -70,7 +74,18 @@ class DeeprApplication : Application() {
single<AutoBackupWorker> { AutoBackupWorker(androidContext(), get(), get()) }

single {
HttpClient(CIO)
HttpClient(CIO) {
install(ContentNegotiation) {
// FIX: Explicitly call the Json function from kotlinx.serialization.json
json(
Json {
prettyPrint = true
isLenient = true
ignoreUnknownKeys = true
},
)
}
}
}

viewModel { AccountViewModel(get(), get(), get(), get(), get(), get()) }
Expand All @@ -84,7 +99,7 @@ class DeeprApplication : Application() {
}

single<LocalServerRepository> {
LocalServerRepositoryImpl(androidContext(), get(), get(), get(), get())
LocalServerRepositoryImpl(androidContext(), get(), get(), get(), get(), get())
}

viewModel {
Expand All @@ -94,6 +109,10 @@ class DeeprApplication : Application() {
single<ReviewManager> {
ReviewManagerFactory.create()
}

viewModel {
TransferLinkLocalServerViewModel(get())
}
}

startKoin {
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/yogeshpaliyal/deepr/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import com.yogeshpaliyal.deepr.ui.screens.LocalNetworkServer
import com.yogeshpaliyal.deepr.ui.screens.LocalNetworkServerScreen
import com.yogeshpaliyal.deepr.ui.screens.Settings
import com.yogeshpaliyal.deepr.ui.screens.SettingsScreen
import com.yogeshpaliyal.deepr.ui.screens.TransferLinkLocalNetworkServer
import com.yogeshpaliyal.deepr.ui.screens.TransferLinkLocalServerScreen
import com.yogeshpaliyal.deepr.ui.screens.home.Home
import com.yogeshpaliyal.deepr.ui.screens.home.HomeScreen
import com.yogeshpaliyal.deepr.ui.theme.DeeprTheme
Expand Down Expand Up @@ -160,6 +162,11 @@ fun Dashboard(
LocalNetworkServerScreen(backStack)
}

is TransferLinkLocalNetworkServer ->
NavEntry(key) {
TransferLinkLocalServerScreen(backStack)
}

else -> NavEntry(Unit) { Text("Unknown route") }
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ interface LocalServerRepository {
val isRunning: StateFlow<Boolean>
val serverUrl: StateFlow<String?>
val serverPort: StateFlow<Int>
val isTransferLinkServerRunning: StateFlow<Boolean>
val transferLinkServerUrl: StateFlow<String?>
val qrCodeData: StateFlow<String?>

suspend fun startServer()
suspend fun startServer(port: Int)

suspend fun stopServer()

suspend fun setServerPort(port: Int)

suspend fun fetchAndImportFromSender(qrTransferInfo: QRTransferInfo): Result<Unit>
}
Loading
Loading