Skip to content

Commit c4b3cde

Browse files
refactor(migration): replace NoOpMigrationManager with K9MigrationManager using QrCodeScannerActivityContract (thunderbird#11099)
2 parents ea1a124 + eb71632 commit c4b3cde

6 files changed

Lines changed: 35 additions & 28 deletions

File tree

app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ androidx.arch.core:core-runtime:2.2.0
1111
androidx.autofill:autofill:1.3.0
1212
androidx.biometric:biometric:1.1.0
1313
androidx.browser:browser:1.3.0
14+
androidx.camera.featurecombinationquery:featurecombinationquery:1.5.2
15+
androidx.camera:camera-camera2:1.5.2
16+
androidx.camera:camera-core:1.5.2
17+
androidx.camera:camera-lifecycle:1.5.2
18+
androidx.camera:camera-video:1.5.2
19+
androidx.camera:camera-view:1.5.2
1420
androidx.cardview:cardview:1.0.0
1521
androidx.collection:collection-jvm:1.5.0
1622
androidx.collection:collection-ktx:1.5.0
@@ -192,8 +198,10 @@ com.github.skydoves:landscapist-coil3:2.9.5
192198
com.github.skydoves:landscapist:2.9.5
193199
com.google.android.flexbox:flexbox:3.0.0
194200
com.google.android.material:material:1.13.0
201+
com.google.auto.value:auto-value-annotations:1.6.3
195202
com.google.errorprone:error_prone_annotations:2.15.0
196203
com.google.guava:listenablefuture:1.0
204+
com.google.zxing:core:3.5.4
197205
com.jakewharton.timber:timber:5.0.1
198206
com.jcraft:jzlib:1.0.7
199207
com.mikepenz:fastadapter-extensions-drag:5.7.0

app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ androidx.arch.core:core-runtime:2.2.0
1111
androidx.autofill:autofill:1.3.0
1212
androidx.biometric:biometric:1.1.0
1313
androidx.browser:browser:1.3.0
14+
androidx.camera.featurecombinationquery:featurecombinationquery:1.5.2
15+
androidx.camera:camera-camera2:1.5.2
16+
androidx.camera:camera-core:1.5.2
17+
androidx.camera:camera-lifecycle:1.5.2
18+
androidx.camera:camera-video:1.5.2
19+
androidx.camera:camera-view:1.5.2
1420
androidx.cardview:cardview:1.0.0
1521
androidx.collection:collection-jvm:1.5.0
1622
androidx.collection:collection-ktx:1.5.0
@@ -202,11 +208,13 @@ com.google.android.gms:play-services-location:19.0.0
202208
com.google.android.gms:play-services-places-placereport:17.0.0
203209
com.google.android.gms:play-services-tasks:18.2.0
204210
com.google.android.material:material:1.13.0
211+
com.google.auto.value:auto-value-annotations:1.6.3
205212
com.google.errorprone:error_prone_annotations:2.15.0
206213
com.google.firebase:firebase-encoders-json:18.0.0
207214
com.google.firebase:firebase-encoders-proto:16.0.0
208215
com.google.firebase:firebase-encoders:17.0.0
209216
com.google.guava:listenablefuture:1.0
217+
com.google.zxing:core:3.5.4
210218
com.jakewharton.timber:timber:5.0.1
211219
com.jcraft:jzlib:1.0.7
212220
com.mikepenz:fastadapter-extensions-drag:5.7.0

feature/migration/launcher/noop/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ plugins {
33
}
44

55
android {
6-
namespace = "app.k9mail.feature.migration.launcher.noop"
6+
namespace = "app.k9mail.feature.migration.launcher.k9"
77
}
88

99
dependencies {
1010
implementation(projects.feature.migration.launcher.api)
11+
implementation(projects.feature.migration.qrcode)
1112
}
1213

1314
codeCoverage {
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package app.k9mail.feature.migration.launcher
22

33
import app.k9mail.feature.migration.launcher.api.MigrationManager
4-
import app.k9mail.feature.migration.launcher.noop.NoOpMigrationManager
4+
import app.k9mail.feature.migration.launcher.k9.K9MigrationManager
5+
import app.k9mail.feature.migration.qrcode.qrCodeModule
56
import org.koin.dsl.module
67

78
val featureMigrationModule = module {
8-
single<MigrationManager> { NoOpMigrationManager() }
9+
includes(qrCodeModule)
10+
single<MigrationManager> { K9MigrationManager() }
911
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package app.k9mail.feature.migration.launcher.k9
2+
3+
import android.net.Uri
4+
import androidx.activity.result.contract.ActivityResultContract
5+
import app.k9mail.feature.migration.launcher.api.MigrationManager
6+
import app.k9mail.feature.migration.qrcode.ui.QrCodeScannerActivityContract
7+
8+
class K9MigrationManager : MigrationManager {
9+
override fun isFeatureIncluded(): Boolean = false
10+
11+
override fun getQrCodeActivityResultContract(): ActivityResultContract<Unit, Uri?> =
12+
QrCodeScannerActivityContract()
13+
}

feature/migration/launcher/noop/src/main/kotlin/app/k9mail/feature/migration/launcher/noop/NoOpMigrationManager.kt

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)