Skip to content

Commit b9c2801

Browse files
committed
Scan implementation using Scanbot, test cases added and Scan Event tracking.
Scanbot migration 1.89.0 -> 4.0.0 NMC-3671 -- e2ee folder selection if e2ee is already setup NMC-3670 -- crash fix while saving into e2ee folder without e2ee setup NMC-3699 & NMC-3701 -- fix e2ee folder path NMC-3702 -- create sub-folder and open them properly for e2ee folders NMC-3966 -- Scanbot migration 4.0.0 to 6.2.0 NMC-4079 -- fix android 15 keyboard overlaps on password input field. NMC-3512 -- show correct scan path in toolbar after scanning NMC-4725 -- migrate to 7.1.1 from 6.2.0 NMC-4766 -- fix updating scan path after successful folder creation
1 parent 5289f60 commit b9c2801

File tree

85 files changed

+5195
-31
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+5195
-31
lines changed

app/build.gradle.kts

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ android {
185185
// adapt structure from Eclipse to Gradle/Android Studio expectations;
186186
// see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
187187
packaging.resources {
188-
excludes.addAll(listOf("META-INF/LICENSE*", "META-INF/versions/9/OSGI-INF/MANIFEST*"))
188+
excludes.addAll(listOf("META-INF/LICENSE*", "META-INF/versions/9/OSGI-INF/MANIFEST*", "META-INF/DEPENDENCIES"))
189189
pickFirsts.add("MANIFEST.MF") // workaround for duplicated manifest on some dependencies
190190
}
191191

@@ -422,10 +422,11 @@ dependencies {
422422
implementation(libs.emoji.google)
423423
// endregion
424424

425+
// NextCloud scan is not required in NMC
425426
// region AppScan, document scanner not available on FDroid (generic) due to OpenCV binaries
426-
"gplayImplementation"(project(":appscan"))
427-
"huaweiImplementation"(project(":appscan"))
428-
"qaImplementation"(project(":appscan"))
427+
// "gplayImplementation"(project(":appscan"))
428+
// "huaweiImplementation"(project(":appscan"))
429+
// "qaImplementation"(project(":appscan"))
429430
// endregion
430431

431432
// region SpotBugs
@@ -513,6 +514,15 @@ dependencies {
513514
implementation(libs.coil)
514515
// endregion
515516

517+
// region scanbot sdk
518+
// scanbot sdk: https://github.com/doo/scanbot-sdk-example-android
519+
implementation(libs.scanbot.sdk)
520+
// apache pdf-box for encrypting pdf files
521+
implementation("org.apache.pdfbox:pdfbox:2.0.1") {
522+
exclude(group = "commons-logging")
523+
}
524+
// endregion
525+
516526
// kotlinx.serialization
517527
implementation(libs.kotlinx.serialization.json)
518528
}

0 commit comments

Comments
 (0)