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
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ import coil3.request.crossfade
import com.flipcash.app.auth.AuthManager
import com.flipcash.app.currency.PreferredCurrencyController
import com.getcode.opencode.repositories.EventRepository
import com.getcode.utils.ErrorUtils
import com.getcode.utils.trace
import dagger.hilt.android.HiltAndroidApp
import io.reactivex.rxjava3.plugins.RxJavaPlugins
import javax.inject.Inject

@HiltAndroidApp
Expand All @@ -44,10 +42,6 @@ class FlipcashApp : Application(), Configuration.Provider, SingletonImageLoader.
override fun onCreate() {
super.onCreate()

RxJavaPlugins.setErrorHandler {
ErrorUtils.handleError(it)
}

authManager.init()

AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
Expand Down
9 changes: 0 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ hilt = "2.59.2"
hilt-jetpack = "1.3.0"
okhttp = "5.3.2"
retrofit = "3.0.0"
rxjava = "3.1.12"
rxandroid = "3.0.2"

kin-sdk = "2.1.2"
grpc-android = "1.81.0"
slf4j = "1.7.36"
Expand Down Expand Up @@ -130,7 +127,6 @@ lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewm
androidx-browser = { module = "androidx.browser:browser", version.ref = "androidx-browser" }
androidx-paging-runtime = { module = "androidx.paging:paging-runtime-ktx", version.ref = "androidx-paging" }
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" }
androidx-room-rxjava3 = { module = "androidx.room:room-rxjava3", version.ref = "androidx-room" }
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "androidx-room" }
androidx-room-paging = { module = "androidx.room:room-paging", version.ref = "androidx-room" }
Expand Down Expand Up @@ -163,7 +159,6 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" }
kotlinx-coroutines-rx3 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-rx3", version.ref = "kotlinx-coroutines" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.4.0" }
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
Expand Down Expand Up @@ -200,10 +195,6 @@ voyager-bottomsheet = { module = "cafe.adriel.voyager:voyager-bottom-sheet-navig
voyager-tabs = { module = "cafe.adriel.voyager:voyager-tab-navigator", version.ref = "voyager" }
voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" }

# RxJava
rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" }
rxandroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rxandroid" }

# Networking / gRPC / Protobuf
slf4j = { module = "org.slf4j:slf4j-android", version.ref = "slf4j" }
grpc-android = { module = "io.grpc:grpc-android", version.ref = "grpc-android" }
Expand Down
1 change: 0 additions & 1 deletion libs/locale/impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ dependencies {
api(libs.androidx.annotation)
api(libs.kotlin.stdlib)
api(libs.kotlinx.coroutines.core)
api(libs.kotlinx.coroutines.rx3)

implementation(libs.bundles.hilt)
ksp(libs.bundles.hilt.compiler)
Expand Down
1 change: 0 additions & 1 deletion libs/locale/public/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ dependencies {
api(libs.androidx.annotation)
api(libs.kotlin.stdlib)
api(libs.kotlinx.coroutines.core)
api(libs.kotlinx.coroutines.rx3)
}
1 change: 0 additions & 1 deletion libs/logging/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ dependencies {

api(libs.timber)
implementation(libs.androidx.annotation)
implementation(libs.rxjava)
implementation(libs.grpc.kotlin)
implementation(project(":libs:messaging"))
}
4 changes: 1 addition & 3 deletions libs/logging/src/main/kotlin/com/getcode/utils/ErrorUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import com.getcode.manager.TopBarManager
import io.grpc.Status
import io.grpc.StatusException
import io.grpc.StatusRuntimeException
import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException
import io.reactivex.rxjava3.exceptions.UndeliverableException
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.TimeoutCancellationException
import timber.log.Timber
Expand Down Expand Up @@ -40,7 +38,7 @@ object ErrorUtils {
if (isGmsTransientError(throwable)) return

val throwableCause: Throwable =
if (throwable.cause != null && (throwable is UndeliverableException || throwable is OnErrorNotImplementedException || throwable is CodeServerError))
if (throwable.cause != null && throwable is CodeServerError)
throwable.cause ?: throwable
else throwable

Expand Down
1 change: 0 additions & 1 deletion services/flipcash-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ dependencies {
implementation(libs.androidx.lifecycle.runtime)
implementation(libs.androidx.room.runtime)
implementation(libs.androidx.room.ktx)
implementation(libs.androidx.room.rxjava3)
implementation(libs.androidx.room.paging)
implementation(libs.okhttp)
implementation(libs.mixpanel)
Expand Down
1 change: 0 additions & 1 deletion services/flipcash/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ dependencies {
implementation(libs.androidx.lifecycle.runtime)
implementation(libs.androidx.room.runtime)
implementation(libs.androidx.room.ktx)
implementation(libs.androidx.room.rxjava3)
implementation(libs.androidx.room.paging)
implementation(libs.okhttp)
implementation(libs.mixpanel)
Expand Down
2 changes: 0 additions & 2 deletions ui/navigation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ dependencies {
api(project(":ui:resources"))
implementation(project(":ui:theme"))

api(libs.rxjava)

implementation(libs.compose.material3)
implementation(libs.compose.activities)
implementation(libs.bundles.kotlinx.serialization)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,13 @@ package com.getcode.view

import androidx.lifecycle.ViewModel
import com.getcode.util.resources.ResourceHelper
import io.reactivex.rxjava3.disposables.CompositeDisposable

@Deprecated(
message = "Replaced With BaseViewModel2",
replaceWith = ReplaceWith("Use BaseViewModel2", "com.getcode.view.BaseViewModel2"))
abstract class BaseViewModel(
private val resources: ResourceHelper,
) : ViewModel() {
private val compositeDisposable = CompositeDisposable()

override fun onCleared() {
super.onCleared()
compositeDisposable.clear()
}

open fun setIsLoading(isLoading: Boolean) {}

fun getString(resId: Int): String = resources.getString(resId)
Expand Down
1 change: 0 additions & 1 deletion ui/resources/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ dependencies {
implementation(libs.androidx.exifinterface)
api(libs.kotlin.stdlib)
api(libs.kotlinx.coroutines.core)
api(libs.kotlinx.coroutines.rx3)
}
Loading