Skip to content

Commit

Permalink
feat: lib update
Browse files Browse the repository at this point in the history
  • Loading branch information
pantasystem committed Sep 18, 2024
1 parent c07dd83 commit ce38e01
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 31 deletions.
18 changes: 13 additions & 5 deletions app/src/main/java/jp/panta/misskeyandroidclient/MiApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,15 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
import dagger.hilt.android.HiltAndroidApp
import jp.panta.misskeyandroidclient.setup.AppStateController
import jp.panta.misskeyandroidclient.worker.WorkerJobInitializer
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import kotlinx.coroutines.plus
import net.pantasystem.milktea.app_store.account.AccountStore
import net.pantasystem.milktea.common.Logger
import net.pantasystem.milktea.common_android.platform.activeNetworkFlow
Expand Down Expand Up @@ -91,11 +98,12 @@ class MiApplication : Application(), Configuration.Provider {

}

override fun getWorkManagerConfiguration(): Configuration {
return Configuration.Builder()
override val workManagerConfiguration: Configuration
get() = Configuration.Builder()
.setWorkerFactory(workerFactory)
.build()
}



override fun onTrimMemory(level: Int) {
super.onTrimMemory(level)
Expand Down
39 changes: 17 additions & 22 deletions libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
[versions]
date-time = "0.4.0"
compose = "1.3.3"
compose-material-icons = "1.5.3"
compose = "1.7.1"
compose-material-icons = "1.7.1"
accompanist-swiperefresh = "0.25.1"
activity-compose = "1.6.1"
activity-compose = "1.9.2"
accompanist-pager = "0.14.0"
coil = "2.4.0"
hilt = "2.48.1"
lifecycle = "2.6.2"
arch = "2.1.0"
lifecycle = "2.8.5"
arch = "2.2.0"
glide = "4.14.2"
animation-apng = "2.24.0"
appcompat = "1.6.1"
material = "1.8.0"
core-ktx = "1.9.0"
fragment-ktx = "1.5.5"
activity-ktx = "1.5.0"
emoji2 = "1.4.0"
appcompat = "1.7.0"
material = "1.12.0"
core-ktx = "1.13.1"
fragment-ktx = "1.8.3"
activity-ktx = "1.9.2"
emoji2 = "1.5.0"
constraintlayout = "2.1.4"
viewpager2 = "1.1.0-beta01"
viewpager2 = "1.1.0"
swiperefreshlayout = "1.2.0-alpha01"
flexbox = "3.0.0"
okhttp3 = "4.10.0"
work = "2.8.1"
work = "2.9.1"
junit = "4.13.2"
test-espresso = "3.5.0"
test-espresso = "3.6.1"
appstartup = "1.1.1"
junit-jupiter-api = "5.9.3"
junit-jupiter-engine = "5.7.0"
junit-jupiter-engine = "5.9.3"
robolectric = "4.13"
serialization = "1.6.0"
recyclerview = "1.3.1"
serialization = "1.6.3"
recyclerview = "1.3.2"
konfetti = "2.0.3"
compose-constraintlayout = "1.0.1"

Expand Down Expand Up @@ -63,13 +63,8 @@ hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", vers

# Lifecycle and Arch
lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "lifecycle" }
lifecycle-viewmodel-savestate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "lifecycle" }
lifecycle-compiler = { module = "androidx.lifecycle:lifecycle-compiler", version.ref = "lifecycle" }
lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "lifecycle" }
lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.ref = "lifecycle" }
lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "arch" }
lifecycle-runtime-testing = { module = "androidx.lifecycle:lifecycle-runtime-testing", version.ref = "lifecycle" }
lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version = "2.5.1" }
lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version = "2.5.1" }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import net.pantasystem.milktea.common_navigation.MainNavigation
import net.pantasystem.milktea.data.infrastructure.auth.Authorization
import net.pantasystem.milktea.data.infrastructure.auth.custom.CustomAuthStore
import net.pantasystem.milktea.data.infrastructure.auth.from
import java.util.*
import java.util.Locale
import javax.inject.Inject


Expand Down Expand Up @@ -152,11 +152,11 @@ class AuthorizationActivity : AppCompatActivity() {


@SuppressLint("MissingSuperCall")
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
val authStore = CustomAuthStore.newInstance(this)
val callbackToken = intent?.data?.getQueryParameter("token")
val callbackMastodonCode = intent?.data?.getQueryParameter("code")
val callbackToken = intent.data?.getQueryParameter("token")
val callbackMastodonCode = intent.data?.getQueryParameter("code")

if (callbackToken?.isNotBlank() == true) {
authStore.getCustomAuthBridge()?.let {
Expand Down

0 comments on commit ce38e01

Please sign in to comment.