From c4ac87afe0bccd3d683399c92501a3ec06fe9013 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 18 Nov 2026 14:50:10 +0100 Subject: [PATCH] feat(navigator): internal two way sync Signed-off-by: alperozturk96 --- app/src/main/AndroidManifest.xml | 3 - .../nextcloud/client/di/ComponentsModule.kt | 4 +- .../android/ui/activity/SettingsActivity.java | 3 +- .../InternalTwoWaySyncFragment.kt} | 225 ++++++++++-------- .../ui/InternalTwoWaySyncMenuProvider.kt | 41 ++++ .../android/ui/navigation/NavigatorScreen.kt | 9 + .../layout/fragment_internal_two_way_sync.xml | 61 +++++ .../layout/internal_two_way_sync_layout.xml | 71 ------ 8 files changed, 238 insertions(+), 179 deletions(-) rename app/src/main/java/com/owncloud/android/ui/{activity/InternalTwoWaySyncActivity.kt => fragment/internalTwoWaySync/InternalTwoWaySyncFragment.kt} (58%) create mode 100644 app/src/main/java/com/owncloud/android/ui/fragment/internalTwoWaySync/ui/InternalTwoWaySyncMenuProvider.kt create mode 100644 app/src/main/res/layout/fragment_internal_two_way_sync.xml delete mode 100644 app/src/main/res/layout/internal_two_way_sync_layout.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8014d33ba07c..13bbde003c79 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -279,9 +279,6 @@ - diff --git a/app/src/main/java/com/nextcloud/client/di/ComponentsModule.kt b/app/src/main/java/com/nextcloud/client/di/ComponentsModule.kt index 745696d45571..703aa106508e 100644 --- a/app/src/main/java/com/nextcloud/client/di/ComponentsModule.kt +++ b/app/src/main/java/com/nextcloud/client/di/ComponentsModule.kt @@ -61,7 +61,6 @@ import com.owncloud.android.ui.activity.FileActivity import com.owncloud.android.ui.activity.FileDisplayActivity import com.owncloud.android.ui.activity.FilePickerActivity import com.owncloud.android.ui.activity.FolderPickerActivity -import com.owncloud.android.ui.activity.InternalTwoWaySyncActivity import com.owncloud.android.ui.activity.ManageAccountsActivity import com.owncloud.android.ui.activity.ManageSpaceActivity import com.owncloud.android.ui.activity.PassCodeActivity @@ -122,6 +121,7 @@ import com.owncloud.android.ui.fragment.albums.bottomsheet.AlbumSharingBottomShe import com.owncloud.android.ui.fragment.community.CommunityFragment import com.owncloud.android.ui.fragment.contactsbackup.BackupFragment import com.owncloud.android.ui.fragment.contactsbackup.BackupListFragment +import com.owncloud.android.ui.fragment.internalTwoWaySync.InternalTwoWaySyncFragment import com.owncloud.android.ui.fragment.localfilelist.LocalFileListFragment import com.owncloud.android.ui.fragment.notifications.NotificationsFragment import com.owncloud.android.ui.fragment.autoUpload.AutoUploadFragment @@ -494,7 +494,7 @@ internal interface ComponentsModule { fun testJob(): TestJob @ContributesAndroidInjector - fun internalTwoWaySyncActivity(): InternalTwoWaySyncActivity + fun internalTwoWaySyncFragment(): InternalTwoWaySyncFragment @OptIn(UnstableApi::class) @ContributesAndroidInjector diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java index 92a192af45c9..9ca04938b2df 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java @@ -694,8 +694,7 @@ private void setupInternalTwoWaySyncPreference() { Preference twoWaySync = findPreference("internal_two_way_sync"); twoWaySync.setOnPreferenceClickListener(preference -> { - Intent intent = new Intent(this, InternalTwoWaySyncActivity.class); - startActivity(intent); + startActivity(NavigatorActivity.Companion.intent(this, NavigatorScreen.InternalTwoWaySync.INSTANCE)); return true; }); } diff --git a/app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt b/app/src/main/java/com/owncloud/android/ui/fragment/internalTwoWaySync/InternalTwoWaySyncFragment.kt similarity index 58% rename from app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt rename to app/src/main/java/com/owncloud/android/ui/fragment/internalTwoWaySync/InternalTwoWaySyncFragment.kt index 4710bb01f8e4..45f3a94c804b 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/internalTwoWaySync/InternalTwoWaySyncFragment.kt @@ -1,35 +1,41 @@ /* * Nextcloud - Android Client * + * SPDX-FileCopyrightText: 2026 Alper Ozturk * SPDX-FileCopyrightText: 2024 Tobias Kaminsky * SPDX-License-Identifier: AGPL-3.0-or-later */ - -package com.owncloud.android.ui.activity +package com.owncloud.android.ui.fragment.internalTwoWaySync import android.annotation.SuppressLint import android.content.res.ColorStateList import android.os.Bundle -import android.view.Menu +import android.view.LayoutInflater import android.view.MenuItem import android.view.View +import android.view.ViewGroup import android.widget.ArrayAdapter +import androidx.fragment.app.Fragment +import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import com.nextcloud.android.common.ui.theme.utils.ColorRole -import com.nextcloud.client.di.Injectable +import com.nextcloud.client.account.User import com.nextcloud.client.jobs.BackgroundJobManager import com.nextcloud.client.jobs.download.FileDownloadWorker +import com.nextcloud.client.preferences.AppPreferences +import com.nextcloud.utils.extensions.getTypedActivity import com.nextcloud.utils.extensions.hourPlural import com.nextcloud.utils.extensions.minPlural import com.nextcloud.utils.extensions.setVisibleIf -import com.owncloud.android.BuildConfig import com.owncloud.android.R -import com.owncloud.android.databinding.InternalTwoWaySyncLayoutBinding +import com.owncloud.android.databinding.FragmentInternalTwoWaySyncBinding +import com.owncloud.android.datamodel.FileDataStorageManager import com.owncloud.android.lib.common.utils.Log_OC -import com.owncloud.android.ui.activity.drawer.DrawerActivity import com.owncloud.android.ui.adapter.InternalTwoWaySyncAdapter -import com.owncloud.android.ui.navigation.model.ActionBarStyle +import com.owncloud.android.ui.fragment.internalTwoWaySync.ui.InternalTwoWaySyncMenuProvider +import com.owncloud.android.ui.navigation.NavigatorActivity +import com.owncloud.android.utils.theme.ViewThemeUtils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -37,58 +43,76 @@ import javax.inject.Inject import kotlin.time.Duration.Companion.hours import kotlin.time.Duration.Companion.minutes -class InternalTwoWaySyncActivity : - DrawerActivity(), - Injectable, +class InternalTwoWaySyncFragment : + Fragment(), InternalTwoWaySyncAdapter.InternalTwoWaySyncAdapterOnUpdate { - private val tag = "InternalTwoWaySyncActivity" - @Inject - lateinit var backgroundJobManager: BackgroundJobManager + companion object { + private const val TAG = "InternalTwoWaySyncFragment" + } + + @Inject lateinit var backgroundJobManager: BackgroundJobManager + + @Inject lateinit var preferences: AppPreferences + + @Inject lateinit var fileDataStorageManager: FileDataStorageManager - lateinit var binding: InternalTwoWaySyncLayoutBinding + @Inject lateinit var viewThemeUtils: ViewThemeUtils - private lateinit var internalTwoWaySyncAdapter: InternalTwoWaySyncAdapter + private var binding: FragmentInternalTwoWaySyncBinding? = null + private var internalTwoWaySyncAdapter: InternalTwoWaySyncAdapter? = null private var disableForAllFoldersMenuButton: MenuItem? = null - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) + private val user: User? + get() = getTypedActivity(NavigatorActivity::class.java)?.user?.orElse(null) - internalTwoWaySyncAdapter = - InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), this, this, viewThemeUtils) + // region Lifecycle + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { + val binding = FragmentInternalTwoWaySyncBinding.inflate(inflater, container, false) + this.binding = binding + return binding.root + } - binding = InternalTwoWaySyncLayoutBinding.inflate(layoutInflater) - setContentView(binding.root) + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + val user = user ?: return + + internalTwoWaySyncAdapter = + InternalTwoWaySyncAdapter(fileDataStorageManager, user, requireContext(), this, viewThemeUtils) - showActionBar(ActionBarStyle.Plain) - setupActionBar() setupTwoWaySyncAdapter() setupEmptyList() setupTwoWaySyncToggle() setupTwoWaySyncInterval() checkLayoutVisibilities(preferences.isTwoWaySyncEnabled) + addMenuProvider() } - private fun setupActionBar() { - setActionBarTitle(getString(R.string.two_way_sync_activity_title)) - supportActionBar?.setDisplayHomeAsUpEnabled(true) + override fun onDestroyView() { + disableForAllFoldersMenuButton = null + internalTwoWaySyncAdapter = null + super.onDestroyView() + binding = null } + // endregion + // region Setup @SuppressLint("NotifyDataSetChanged") private fun setupTwoWaySyncAdapter() { - if (preferences.isTwoWaySyncEnabled) { - binding.run { - list.run { - setEmptyView(emptyList.emptyListView) - adapter = internalTwoWaySyncAdapter - layoutManager = LinearLayoutManager(this@InternalTwoWaySyncActivity) - adapter?.notifyDataSetChanged() - } - } + if (!preferences.isTwoWaySyncEnabled) return + val binding = binding ?: return + + binding.list.run { + setEmptyView(binding.emptyList.emptyListView) + adapter = internalTwoWaySyncAdapter + layoutManager = LinearLayoutManager(requireContext()) + adapter?.notifyDataSetChanged() } } private fun setupEmptyList() { + val binding = binding ?: return + binding.emptyList.run { emptyListViewHeadline.run { visibility = View.VISIBLE @@ -113,56 +137,34 @@ class InternalTwoWaySyncActivity : } } - private fun disableTwoWaySyncAndWorkers() { - lifecycleScope.launch(Dispatchers.IO) { - try { - backgroundJobManager.cancelTwoWaySyncJob() - - val currentUser = user.get() - - val folders = fileDataStorageManager.getInternalTwoWaySyncFolders(currentUser) - folders.forEach { folder -> - FileDownloadWorker.cancelOperation(currentUser.accountName, folder.fileId) - backgroundJobManager.cancelFilesDownloadJob(currentUser.accountName, folder.fileId) - - folder.internalFolderSyncTimestamp = -1L - fileDataStorageManager.saveFile(folder) - } - - withContext(Dispatchers.Main) { - internalTwoWaySyncAdapter.update() - } - } catch (e: Exception) { - Log_OC.d(tag, "Error caught at disableTwoWaySyncAndWorkers: $e") - } - } - } - @Suppress("MagicNumber") private fun setupTwoWaySyncInterval() { + val binding = binding ?: return + val context = requireContext() + val durations = listOf( - 15.minutes to minPlural(15), - 30.minutes to minPlural(30), - 45.minutes to minPlural(45), - 1.hours to hourPlural(1), - 2.hours to hourPlural(2), - 4.hours to hourPlural(4), - 6.hours to hourPlural(6), - 8.hours to hourPlural(8), - 12.hours to hourPlural(12), - 24.hours to hourPlural(24) + 15.minutes to context.minPlural(15), + 30.minutes to context.minPlural(30), + 45.minutes to context.minPlural(45), + 1.hours to context.hourPlural(1), + 2.hours to context.hourPlural(2), + 4.hours to context.hourPlural(4), + 6.hours to context.hourPlural(6), + 8.hours to context.hourPlural(8), + 12.hours to context.hourPlural(12), + 24.hours to context.hourPlural(24) ) val selectedDuration = durations.find { it.first.inWholeMinutes == preferences.twoWaySyncInterval } val adapter = ArrayAdapter( - this, + context, android.R.layout.simple_dropdown_item_1line, durations.map { it.second } ) binding.twoWaySyncInterval.run { setAdapter(adapter) - setText(selectedDuration?.second ?: minPlural(15), false) + setText(selectedDuration?.second ?: context.minPlural(15), false) setOnItemClickListener { _, _, position, _ -> handleDurationSelected(durations[position].first.inWholeMinutes) } @@ -173,12 +175,9 @@ class InternalTwoWaySyncActivity : } } - private fun handleDurationSelected(duration: Long) { - preferences.twoWaySyncInterval = duration - backgroundJobManager.scheduleInternal2WaySync(duration) - } - private fun setupTwoWaySyncToggle() { + val binding = binding ?: return + binding.twoWaySyncToggle.isChecked = preferences.isTwoWaySyncEnabled binding.twoWaySyncToggle.setOnCheckedChangeListener { _, isChecked -> preferences.setTwoWaySyncStatus(isChecked) @@ -195,42 +194,65 @@ class InternalTwoWaySyncActivity : viewThemeUtils.material.colorMaterialSwitch(binding.twoWaySyncToggle) } - private fun checkLayoutVisibilities(condition: Boolean) { - binding.listFrameLayout.setVisibleIf(condition) - binding.twoWaySyncIntervalLayout.setVisibleIf(condition) + private fun addMenuProvider() { + val menuProvider = InternalTwoWaySyncMenuProvider( + onDisableForAllFoldersItemCreated = { menuItem -> + disableForAllFoldersMenuButton = menuItem + checkDisableForAllFoldersMenuButtonVisibility() + }, + onDisableForAllFolders = { disableTwoWaySyncAndWorkers() }, + onRunNow = { backgroundJobManager.runNowInternal2WaySync() } + ) + requireActivity().addMenuProvider(menuProvider, viewLifecycleOwner, Lifecycle.State.RESUMED) } + // endregion - override fun onCreateOptionsMenu(menu: Menu?): Boolean { - menuInflater.inflate(R.menu.activity_internal_two_way_sync, menu) - disableForAllFoldersMenuButton = menu?.findItem(R.id.action_dismiss_two_way_sync) - checkDisableForAllFoldersMenuButtonVisibility() - menu?.findItem(R.id.action_run_two_way_sync)?.isVisible = BuildConfig.DEBUG - - return super.onCreateOptionsMenu(menu) + // region Actions + private fun handleDurationSelected(duration: Long) { + preferences.twoWaySyncInterval = duration + backgroundJobManager.scheduleInternal2WaySync(duration) } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - android.R.id.home -> { - onBackPressedDispatcher.onBackPressed() - } + private fun disableTwoWaySyncAndWorkers() { + val currentUser = user ?: return - R.id.action_dismiss_two_way_sync -> { - disableTwoWaySyncAndWorkers() - } + lifecycleScope.launch(Dispatchers.IO) { + try { + backgroundJobManager.cancelTwoWaySyncJob() - R.id.action_run_two_way_sync -> { - backgroundJobManager.runNowInternal2WaySync() + val folders = fileDataStorageManager.getInternalTwoWaySyncFolders(currentUser) + folders.forEach { folder -> + FileDownloadWorker.cancelOperation(currentUser.accountName, folder.fileId) + backgroundJobManager.cancelFilesDownloadJob(currentUser.accountName, folder.fileId) + + folder.internalFolderSyncTimestamp = -1L + fileDataStorageManager.saveFile(folder) + } + + withContext(Dispatchers.Main) { + internalTwoWaySyncAdapter?.update() + } + } catch (e: Exception) { + Log_OC.d(TAG, "Error caught at disableTwoWaySyncAndWorkers: $e") } } + } + // endregion - return super.onOptionsItemSelected(item) + // region Visibility + private fun checkLayoutVisibilities(condition: Boolean) { + val binding = binding ?: return + + binding.listFrameLayout.setVisibleIf(condition) + binding.twoWaySyncIntervalLayout.setVisibleIf(condition) } private fun checkDisableForAllFoldersMenuButtonVisibility() { - lifecycleScope.launch { + val currentUser = user ?: return + + viewLifecycleOwner.lifecycleScope.launch { val folderSize = withContext(Dispatchers.IO) { - fileDataStorageManager.getInternalTwoWaySyncFolders(user.get()).size + fileDataStorageManager.getInternalTwoWaySyncFolders(currentUser).size } checkDisableForAllFoldersMenuButtonVisibility(preferences.isTwoWaySyncEnabled, folderSize) @@ -249,4 +271,5 @@ class InternalTwoWaySyncActivity : override fun onUpdate(folderSize: Int) { checkDisableForAllFoldersMenuButtonVisibility(preferences.isTwoWaySyncEnabled, folderSize) } + // endregion } diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/internalTwoWaySync/ui/InternalTwoWaySyncMenuProvider.kt b/app/src/main/java/com/owncloud/android/ui/fragment/internalTwoWaySync/ui/InternalTwoWaySyncMenuProvider.kt new file mode 100644 index 000000000000..d833ba008e47 --- /dev/null +++ b/app/src/main/java/com/owncloud/android/ui/fragment/internalTwoWaySync/ui/InternalTwoWaySyncMenuProvider.kt @@ -0,0 +1,41 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +package com.owncloud.android.ui.fragment.internalTwoWaySync.ui + +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import androidx.core.view.MenuProvider +import com.owncloud.android.BuildConfig +import com.owncloud.android.R + +class InternalTwoWaySyncMenuProvider( + private val onDisableForAllFoldersItemCreated: (MenuItem?) -> Unit, + private val onDisableForAllFolders: () -> Unit, + private val onRunNow: () -> Unit +) : MenuProvider { + + override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { + menuInflater.inflate(R.menu.activity_internal_two_way_sync, menu) + menu.findItem(R.id.action_run_two_way_sync)?.isVisible = BuildConfig.DEBUG + onDisableForAllFoldersItemCreated(menu.findItem(R.id.action_dismiss_two_way_sync)) + } + + override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) { + R.id.action_dismiss_two_way_sync -> { + onDisableForAllFolders() + true + } + + R.id.action_run_two_way_sync -> { + onRunNow() + true + } + + else -> false + } +} diff --git a/app/src/main/java/com/owncloud/android/ui/navigation/NavigatorScreen.kt b/app/src/main/java/com/owncloud/android/ui/navigation/NavigatorScreen.kt index 0bff64f17523..321e611bc188 100644 --- a/app/src/main/java/com/owncloud/android/ui/navigation/NavigatorScreen.kt +++ b/app/src/main/java/com/owncloud/android/ui/navigation/NavigatorScreen.kt @@ -14,6 +14,7 @@ import com.owncloud.android.ui.fragment.ActivitiesFragment import com.owncloud.android.ui.fragment.community.CommunityFragment import com.owncloud.android.ui.fragment.notifications.NotificationsFragment import com.owncloud.android.ui.fragment.autoUpload.AutoUploadFragment +import com.owncloud.android.ui.fragment.internalTwoWaySync.InternalTwoWaySyncFragment import com.owncloud.android.ui.fragment.uploadList.UploadListFragment import com.owncloud.android.ui.navigation.model.ActionBarStyle import com.owncloud.android.ui.trashbin.TrashbinFragment @@ -39,6 +40,9 @@ sealed class NavigatorScreen(val tag: String, val hasDrawer: Boolean = true) : P @Parcelize object UploadList : NavigatorScreen(UPLOAD_LIST_TAG) + @Parcelize + object InternalTwoWaySync : NavigatorScreen(INTERNAL_TWO_WAY_SYNC_TAG, hasDrawer = false) + companion object { private const val TRASHBIN_TAG = "Trashbin" private const val ACTIVITIES_TAG = "Activities" @@ -46,6 +50,7 @@ sealed class NavigatorScreen(val tag: String, val hasDrawer: Boolean = true) : P private const val NOTIFICATIONS_TAG = "Notifications" private const val UPLOAD_LIST_TAG = "UploadList" private const val AUTO_UPLOAD_TAG = "AutoUpload" + private const val INTERNAL_TWO_WAY_SYNC_TAG = "InternalTwoWaySync" fun fromTag(tag: String?): NavigatorScreen? = when (tag) { ACTIVITIES_TAG -> Activities @@ -54,6 +59,7 @@ sealed class NavigatorScreen(val tag: String, val hasDrawer: Boolean = true) : P TRASHBIN_TAG -> Trashbin UPLOAD_LIST_TAG -> UploadList AUTO_UPLOAD_TAG -> AutoUpload + INTERNAL_TWO_WAY_SYNC_TAG -> InternalTwoWaySync else -> null } } @@ -65,6 +71,7 @@ sealed class NavigatorScreen(val tag: String, val hasDrawer: Boolean = true) : P UploadList -> R.id.nav_uploads Notifications -> -1 AutoUpload -> R.id.nav_settings + InternalTwoWaySync -> R.id.nav_settings } fun actionBarStyle(): Pair = when (this) { @@ -74,6 +81,7 @@ sealed class NavigatorScreen(val tag: String, val hasDrawer: Boolean = true) : P UploadList -> ActionBarStyle.Plain to R.string.uploads_view_title Notifications -> ActionBarStyle.Plain to R.string.drawer_item_notifications AutoUpload -> ActionBarStyle.Plain to R.string.drawer_synced_folders + InternalTwoWaySync -> ActionBarStyle.Plain to R.string.two_way_sync_activity_title } fun toFragment(): Fragment = when (this) { @@ -83,5 +91,6 @@ sealed class NavigatorScreen(val tag: String, val hasDrawer: Boolean = true) : P Trashbin -> TrashbinFragment() UploadList -> UploadListFragment() AutoUpload -> AutoUploadFragment() + InternalTwoWaySync -> InternalTwoWaySyncFragment() } } diff --git a/app/src/main/res/layout/fragment_internal_two_way_sync.xml b/app/src/main/res/layout/fragment_internal_two_way_sync.xml new file mode 100644 index 000000000000..833a4b758321 --- /dev/null +++ b/app/src/main/res/layout/fragment_internal_two_way_sync.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/internal_two_way_sync_layout.xml b/app/src/main/res/layout/internal_two_way_sync_layout.xml deleted file mode 100644 index 57bbce6139d8..000000000000 --- a/app/src/main/res/layout/internal_two_way_sync_layout.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -