Skip to content

feat(scan): New Document Scanning, powered by FairScan #17710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
PhilLab wants to merge 11 commits into
base: master
Choose a base branch
from
+363 −1,307
Draft

feat(scan): New Document Scanning, powered by FairScan #17710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
035716e
refactor(scan): remove PDF-from-images background job
PhilLab Sep 20, 2026
ae42693
refactor(scan): remove built-in multi-page scan screen
PhilLab Sep 20, 2026
5b4cf00
refactor(scan): remove :appscan module and its reflection wiring
PhilLab Sep 20, 2026
5b28a12
WIP feat(scan): Include FairScan via mavenLocal
PhilLab Sep 24, 2026
979a59f
WIP feat(scan): CI builds Fairscan to local maven
PhilLab Sep 24, 2026
e9e5baa
feat(scan): Start onboard FairScan component, if external app not ins…
PhilLab Sep 24, 2026
8d600bb
fix(scan): finish embedded FairScan scan-to-PDF upload
PhilLab Sep 30, 2026
a4fc46e
Manually added key for dependency sh.calvin.reorderable
PhilLab Oct 14, 2026
7320e71
Updated dependency verification data
PhilLab Oct 14, 2026
5fc1252
feat(scan): Using library fork of FairScan, available on Jitpack
PhilLab Oct 18, 2026
c2d9c02
Added verification metadata for fairscan library Jitpack artifact
PhilLab Oct 20, 2026
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
14 changes: 2 additions & 12 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,13 +342,6 @@ tasks.named("check").configure {
val kspConfiguration = "ksp"
val kspAndroidTestConfiguration = "kspAndroidTest"
val gplayImplementationConfiguration = "gplayImplementation"
val huaweiImplementationConfiguration = "huaweiImplementation"
val qaImplementationConfiguration = "qaImplementation"
val appScanConfigurations = listOf(
gplayImplementationConfiguration,
huaweiImplementationConfiguration,
qaImplementationConfiguration
)

dependencies {
// region Nextcloud library
Expand Down Expand Up @@ -443,11 +436,8 @@ dependencies {
implementation(libs.emoji.google)
// endregion

// region AppScan, document scanner not available on FDroid (generic) due to OpenCV binaries
// To enable the feature for another variant, add its "<variant>Implementation" here.
appScanConfigurations.forEach { configuration ->
add(configuration, project(":appscan"))
}
// region FairScan
implementation(libs.fairscan)
Comment thread
PhilLab marked this conversation as resolved.
// endregion

// region SpotBugs
Expand Down
71 changes: 0 additions & 71 deletions app/src/androidTest/java/com/nextcloud/client/documentscan/GeneratePDFUseCaseTest.kt
View file
Open in desktop

This file was deleted.

13 changes: 1 addition & 12 deletions app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import android.os.Looper
import android.view.ViewGroup
import android.webkit.SslErrorHandler
import android.widget.TextView
import androidx.activity.result.contract.ActivityResultContract
import androidx.fragment.app.DialogFragment
import androidx.test.core.app.ActivityScenario
import androidx.test.core.app.launchActivity
Expand All @@ -37,7 +36,6 @@ import com.nextcloud.android.lib.resources.profile.HoverCard
import com.nextcloud.client.account.RegisteredUser
import com.nextcloud.client.account.Server
import com.nextcloud.client.device.DeviceInfo
import com.nextcloud.client.documentscan.AppScanOptionalFeature
import com.nextcloud.ui.ChooseAccountDialogFragment
import com.nextcloud.ui.ChooseAccountDialogFragment.Companion.newInstance
import com.nextcloud.ui.SetOnlineStatusBottomSheet
Expand Down Expand Up @@ -433,10 +431,7 @@ class DialogFragmentIT : AbstractIT() {
override fun newSpreadsheet() = Unit
override fun newPresentation() = Unit
override fun directCameraUpload() = Unit
override fun scanDocUpload() = Unit
override fun scanDocUploadFromApp() = Unit
override val isScanDocUploadFromAppAvailable: Boolean
get() = false
override fun showTemplate(creator: Creator?, headline: String?) = Unit
override fun createRichWorkspace() = Unit
}
Expand Down Expand Up @@ -503,11 +498,6 @@ class DialogFragmentIT : AbstractIT() {
}
CapabilityUtils.updateCapability(capability)

val appScanOptionalFeature: AppScanOptionalFeature = object : AppScanOptionalFeature() {
override fun getScanContract(): ActivityResultContract<Unit, String?> =
throw UnsupportedOperationException("Document scan is not available")
}

val viewThemeUtils = ViewThemeUtils(
materialSchemesForCurrentUser,
ColorUtil(targetContext)
Expand All @@ -523,8 +513,7 @@ class DialogFragmentIT : AbstractIT() {
ocFile,
fda.themeUtils,
viewThemeUtils,
editorUtils,
appScanOptionalFeature
editorUtils
)

sut.show()
Expand Down
50 changes: 0 additions & 50 deletions app/src/androidTestGeneric/java/com/nextcloud/client/di/VariantModuleTest.kt
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions app/src/androidTestGplay/java/com/nextcloud/client/di/VariantModuleTest.kt
View file
Open in desktop

This file was deleted.

14 changes: 9 additions & 5 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="29"
tools:ignore="ScopedStorage" />
tools:ignore="ScopedStorage"
tools:replace="android:maxSdkVersion" />
<uses-permission
android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
tools:ignore="ScopedStorage" />
Expand Down Expand Up @@ -131,6 +132,13 @@
android:name="android.content.APP_RESTRICTIONS"
android:resource="@xml/app_config" />

<meta-data android:name="org.fairscan.app.STORAGE_SUBDIR"
android:value="fairscan" />

<meta-data
android:name="org.fairscan.app.SHOW_SUPPORT"
android:value="false" />

<activity
android:name="com.nextcloud.ui.composeActivity.ComposeActivity"
android:exported="true"
Expand Down Expand Up @@ -669,10 +677,6 @@
android:name=".ui.preview.PreviewBitmapActivity"
android:exported="false"
android:theme="@style/Theme.ownCloud.OverlayGrey" />
<activity
android:name="com.nextcloud.client.documentscan.DocumentScanActivity"
android:exported="false"
android:theme="@style/Theme.ownCloud.Toolbar" />
<activity
android:name="com.nextcloud.client.editimage.EditImageActivity"
android:exported="false"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/nextcloud/client/di/AppComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ import javax.inject.Singleton
ThemeModule::class,
DatabaseModule::class,
DispatcherModule::class,
VariantModule::class,
PlayerModule::class
]
)
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/com/nextcloud/client/di/ComponentsModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ package com.nextcloud.client.di

import androidx.annotation.OptIn
import androidx.media3.common.util.UnstableApi
import com.nextcloud.client.documentscan.DocumentScanActivity
import com.nextcloud.client.editimage.EditImageActivity
import com.nextcloud.client.etm.EtmActivity
import com.nextcloud.client.etm.pages.EtmBackgroundJobsFragment
Expand Down Expand Up @@ -470,9 +469,6 @@ internal interface ComponentsModule {
@ContributesAndroidInjector
fun sendFilesDialog(): SendFilesDialog

@ContributesAndroidInjector
fun documentScanActivity(): DocumentScanActivity

@ContributesAndroidInjector
fun groupfolderListFragment(): GroupfolderListFragment

Expand Down
45 changes: 0 additions & 45 deletions app/src/main/java/com/nextcloud/client/di/VariantModule.kt
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/main/java/com/nextcloud/client/di/ViewModelModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ package com.nextcloud.client.di

import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import com.nextcloud.client.documentscan.DocumentScanViewModel
import com.nextcloud.client.etm.EtmViewModel
import com.nextcloud.client.logger.ui.LogsViewModel
import com.nextcloud.client.player.ui.audio.AudioPlayerViewModel
Expand Down Expand Up @@ -52,11 +51,6 @@ abstract class ViewModelModule {
@ViewModelKey(FileActionsViewModel::class)
abstract fun fileActionsViewModel(vm: FileActionsViewModel): ViewModel

@Binds
@IntoMap
@ViewModelKey(DocumentScanViewModel::class)
abstract fun documentScanViewModel(vm: DocumentScanViewModel): ViewModel

@Binds
@IntoMap
@ViewModelKey(TrashbinFileActionsViewModel::class)
Expand Down
Loading
Loading