Skip to content

Commit 98c65d3

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 2a0b507 commit 98c65d3

85 files changed

Lines changed: 5198 additions & 34 deletions

File tree

Some content is hidden

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

app/build.gradle.kts

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

@@ -428,10 +428,11 @@ dependencies {
428428
implementation(libs.emoji.google)
429429
// endregion
430430

431+
// NextCloud scan is not required in NMC
431432
// region AppScan, document scanner not available on FDroid (generic) due to OpenCV binaries
432-
"gplayImplementation"(project(":appscan"))
433-
"huaweiImplementation"(project(":appscan"))
434-
"qaImplementation"(project(":appscan"))
433+
// "gplayImplementation"(project(":appscan"))
434+
// "huaweiImplementation"(project(":appscan"))
435+
// "qaImplementation"(project(":appscan"))
435436
// endregion
436437

437438
// region SpotBugs
@@ -518,6 +519,15 @@ dependencies {
518519
implementation(libs.coil)
519520
// endregion
520521

522+
// region scanbot sdk
523+
// scanbot sdk: https://github.com/doo/scanbot-sdk-example-android
524+
implementation(libs.scanbot.sdk)
525+
// apache pdf-box for encrypting pdf files
526+
implementation("org.apache.pdfbox:pdfbox:2.0.1") {
527+
exclude(group = "commons-logging")
528+
}
529+
// endregion
530+
521531
// kotlinx.serialization
522532
implementation(libs.kotlinx.serialization.json)
523533
}

0 commit comments

Comments
 (0)