Merge pull request #4032 from owncloud/feature/settings_more_fileapp

[FEATURE REQUEST] Add suggested app to access document provider

Author: JuancaG05

CHANGELOG.md

@@ -24,6 +24,7 @@ Summary
 * Enhancement - Updated WebFinger flow: [#3998](https://github.com/owncloud/android/issues/3998)
 * Enhancement - Monochrome icon for the app: [#4001](https://github.com/owncloud/android/pull/4001)
 * Enhancement - Add prompt parameter to OIDC flow: [#4011](https://github.com/owncloud/android/pull/4011)
+* Enhancement - New setting "Access document provider": [#4032](https://github.com/owncloud/android/pull/4032)
 
 Details
 -------
@@ -168,6 +169,14 @@ Details
    https://github.com/owncloud/android/issues/3984
    https://github.com/owncloud/android/pull/4011
 
+* Enhancement - New setting "Access document provider": [#4032](https://github.com/owncloud/android/pull/4032)
+
+   A new setting has been added in the "More" settings section with a suggested app to access the
+   document provider.
+
+   https://github.com/owncloud/android/issues/4028
+   https://github.com/owncloud/android/pull/4032
+
 Changelog for ownCloud Android Client [3.0.4] (2023-03-07)
 =======================================
 The following sections list the changes in ownCloud Android Client 3.0.4 relevant to

changelog/unreleased/4032

@@ -0,0 +1,7 @@
+Enhancement: New setting "Access document provider"
+
+A new setting has been added in the "More" settings section with a
+suggested app to access the document provider.
+
+https://github.com/owncloud/android/pull/4032
+https://github.com/owncloud/android/issues/4028

owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt

@@ -3,17 +3,17 @@
  *
  * @author Juan Carlos Garrote Gascón
  *
- * Copyright (C) 2021 ownCloud GmbH.
- * <p>
+ * Copyright (C) 2023 ownCloud GmbH.
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
  * as published by the Free Software Foundation.
- * <p>
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * <p>
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -64,6 +64,7 @@ class SettingsMoreFragmentTest {
 
     private var prefHelp: Preference? = null
     private var prefSync: Preference? = null
+    private var prefAccessDocProvider: Preference? = null
     private var prefRecommend: Preference? = null
     private var prefFeedback: Preference? = null
     private var prefImprint: Preference? = null
@@ -110,12 +111,14 @@ class SettingsMoreFragmentTest {
     private fun launchTest(
         helpEnabled: Boolean = true,
         syncEnabled: Boolean = true,
+        docProviderAppEnabled: Boolean = true,
         recommendEnabled: Boolean = true,
         feedbackEnabled: Boolean = true,
         imprintEnabled: Boolean = true
     ) {
         every { moreViewModel.isHelpEnabled() } returns helpEnabled
         every { moreViewModel.isSyncEnabled() } returns syncEnabled
+        every { moreViewModel.isDocProviderAppEnabled() } returns docProviderAppEnabled
         every { moreViewModel.isRecommendEnabled() } returns recommendEnabled
         every { moreViewModel.isFeedbackEnabled() } returns feedbackEnabled
         every { moreViewModel.isImprintEnabled() } returns imprintEnabled
@@ -146,6 +149,16 @@ class SettingsMoreFragmentTest {
             enabled = true
         )
 
+        prefAccessDocProvider = getPreference(PREFERENCE_ACCESS_DOCUMENT_PROVIDER)
+        assertNotNull(prefAccessDocProvider)
+        prefAccessDocProvider?.verifyPreference(
+            keyPref = PREFERENCE_ACCESS_DOCUMENT_PROVIDER,
+            titlePref = context.getString(R.string.prefs_access_document_provider),
+            summaryPref = context.getString(R.string.prefs_access_document_provider_summary),
+            visible = true,
+            enabled = true
+        )
+
         prefRecommend = getPreference(PREFERENCE_RECOMMEND)
         assertNotNull(prefRecommend)
         prefRecommend?.verifyPreference(
@@ -190,6 +203,14 @@ class SettingsMoreFragmentTest {
         assertNull(prefSync)
     }
 
+    @Test
+    fun accessDocumentProviderNotEnabledView() {
+        launchTest(docProviderAppEnabled = false)
+        prefAccessDocProvider = getPreference(PREFERENCE_ACCESS_DOCUMENT_PROVIDER)
+
+        assertNull(prefAccessDocProvider)
+    }
+
     @Test
     fun recommendNotEnabledView() {
         launchTest(recommendEnabled = false)
@@ -238,6 +259,18 @@ class SettingsMoreFragmentTest {
         intended(hasData(context.getString(R.string.url_sync_calendar_contacts)))
     }
 
+    @Test
+    fun accessDocumentProviderOpensNotEmptyUrl() {
+        every { moreViewModel.getDocProviderAppUrl() } returns context.getString(R.string.url_document_provider_app)
+
+        launchTest()
+
+        mockIntent(action = Intent.ACTION_VIEW)
+        onView(withText(R.string.prefs_access_document_provider)).perform(click())
+
+        intended(hasData(context.getString(R.string.url_document_provider_app)))
+    }
+
     @Test
     fun recommendOpensSender() {
         launchTest()
@@ -307,6 +340,7 @@ class SettingsMoreFragmentTest {
     companion object {
         private const val PREFERENCE_HELP = "help"
         private const val PREFERENCE_SYNC_CALENDAR_CONTACTS = "syncCalendarContacts"
+        private const val PREFERENCE_ACCESS_DOCUMENT_PROVIDER = "accessDocumentProvider"
         private const val PREFERENCE_RECOMMEND = "recommend"
         private const val PREFERENCE_FEEDBACK = "feedback"
         private const val PREFERENCE_IMPRINT = "imprint"

owncloudApp/src/main/java/com/owncloud/android/presentation/settings/more/SettingsMoreFragment.kt

@@ -3,17 +3,17 @@
  *
  * @author Juan Carlos Garrote Gascón
  *
- * Copyright (C) 2021 ownCloud GmbH.
- * <p>
+ * Copyright (C) 2023 ownCloud GmbH.
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
  * as published by the Free Software Foundation.
- * <p>
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * <p>
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -39,6 +39,7 @@ class SettingsMoreFragment : PreferenceFragmentCompat() {
     private var moreScreen: PreferenceScreen? = null
     private var prefHelp: Preference? = null
     private var prefSync: Preference? = null
+    private var prefAccessDocProvider: Preference? = null
     private var prefRecommend: Preference? = null
     private var prefFeedback: Preference? = null
     private var prefImprint: Preference? = null
@@ -49,6 +50,7 @@ class SettingsMoreFragment : PreferenceFragmentCompat() {
         moreScreen = findPreference(SCREEN_MORE)
         prefHelp = findPreference(PREFERENCE_HELP)
         prefSync = findPreference(PREFERENCE_SYNC_CALENDAR_CONTACTS)
+        prefAccessDocProvider = findPreference(PREFERENCE_ACCESS_DOCUMENT_PROVIDER)
         prefRecommend = findPreference(PREFERENCE_RECOMMEND)
         prefFeedback = findPreference(PREFERENCE_FEEDBACK)
         prefImprint = findPreference(PREFERENCE_IMPRINT)
@@ -75,6 +77,17 @@ class SettingsMoreFragment : PreferenceFragmentCompat() {
             moreScreen?.removePreferenceFromScreen(prefSync)
         }
 
+        // Access document provider
+        if (moreViewModel.isDocProviderAppEnabled()) {
+            prefAccessDocProvider?.setOnPreferenceClickListener {
+                val docProviderAppUrl = moreViewModel.getDocProviderAppUrl()
+                requireActivity().goToUrl(docProviderAppUrl)
+                true
+            }
+        } else {
+            moreScreen?.removePreferenceFromScreen(prefAccessDocProvider)
+        }
+
         // Recommend
         if (moreViewModel.isRecommendEnabled()) {
             prefRecommend?.setOnPreferenceClickListener {
@@ -121,6 +134,7 @@ class SettingsMoreFragment : PreferenceFragmentCompat() {
         private const val SCREEN_MORE = "more_screen"
         private const val PREFERENCE_HELP = "help"
         private const val PREFERENCE_SYNC_CALENDAR_CONTACTS = "syncCalendarContacts"
+        private const val PREFERENCE_ACCESS_DOCUMENT_PROVIDER = "accessDocumentProvider"
         private const val PREFERENCE_RECOMMEND = "recommend"
         private const val PREFERENCE_FEEDBACK = "feedback"
         private const val PREFERENCE_IMPRINT = "imprint"

owncloudApp/src/main/java/com/owncloud/android/presentation/settings/more/SettingsMoreViewModel.kt

@@ -3,17 +3,17 @@
  *
  * @author Juan Carlos Garrote Gascón
  *
- * Copyright (C) 2021 ownCloud GmbH.
- * <p>
+ * Copyright (C) 2023 ownCloud GmbH.
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
  * as published by the Free Software Foundation.
- * <p>
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * <p>
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -36,6 +36,10 @@ class SettingsMoreViewModel(
 
     fun getSyncUrl() = contextProvider.getString(R.string.url_sync_calendar_contacts)
 
+    fun isDocProviderAppEnabled() = contextProvider.getBoolean(R.bool.access_document_provider_app_enabled)
+
+    fun getDocProviderAppUrl() = contextProvider.getString(R.string.url_document_provider_app)
+
     fun isRecommendEnabled() = contextProvider.getBoolean(R.bool.recommend_enabled)
 
     fun isFeedbackEnabled() = contextProvider.getBoolean(R.bool.feedback_enabled)
@@ -49,6 +53,7 @@ class SettingsMoreViewModel(
     fun shouldMoreSectionBeVisible() =
         isHelpEnabled() ||
                 isSyncEnabled() ||
+                isDocProviderAppEnabled() ||
                 isRecommendEnabled() ||
                 isFeedbackEnabled() ||
                 isImprintEnabled()

owncloudApp/src/main/res/values/setup.xml

@@ -63,6 +63,7 @@
     <!-- Help, imprint and feedback -->
     <bool name="help_enabled">true</bool>
     <bool name="sync_calendar_contacts_enabled">true</bool>
+    <bool name="access_document_provider_app_enabled">true</bool>
     <bool name="imprint_enabled">false</bool>
     <bool name="recommend_enabled">true</bool>
     <bool name="feedback_enabled">true</bool>
@@ -76,6 +77,7 @@
     <string name="mail_feedback" formatted="false">"mailto:[email protected]"</string>
     <string name="url_app_download" formatted="false">"https://play.google.com/store/apps/details?id=com.owncloud.android"</string>
     <string name="url_sync_calendar_contacts">"https://play.google.com/store/apps/details?id=at.bitfire.davdroid"</string>
+    <string name="url_document_provider_app">https://play.google.com/store/apps/details?id=com.marc.files</string>
 
     <!--Destination mail for sending log files -->
     <string name="mail_logger" formatted="false"></string>

owncloudApp/src/main/res/values/strings.xml

@@ -88,6 +88,8 @@
     <string name="prefs_help">Help</string>
     <string name="prefs_sync_calendar_contacts">Sync your contacts, calendars and tasks</string>
     <string name="prefs_sync_calendar_contacts_summary">Install DAVx⁵</string>
+    <string name="prefs_access_document_provider">Access document provider</string>
+    <string name="prefs_access_document_provider_summary">Suggested app to browse the files of your device via the Android native file explorer</string>
     <string name="prefs_recommend">Recommend to a friend</string>
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">Imprint</string>

owncloudApp/src/main/res/xml/settings_more.xml

@@ -27,6 +27,11 @@
         app:key="syncCalendarContacts"
         app:summary="@string/prefs_sync_calendar_contacts_summary"
         app:title="@string/prefs_sync_calendar_contacts" />
+    <Preference
+        app:iconSpaceReserved="false"
+        app:key="accessDocumentProvider"
+        app:summary="@string/prefs_access_document_provider_summary"
+        app:title="@string/prefs_access_document_provider" />
     <Preference
         app:iconSpaceReserved="false"
         app:key="feedback"
@@ -40,4 +45,4 @@
         app:key="imprint"
         app:title="@string/prefs_imprint" />
 
-</PreferenceScreen>
+</PreferenceScreen>

owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/settings/SettingsMoreViewModelTest.kt

@@ -3,17 +3,17 @@
  *
  * @author Juan Carlos Garrote Gascón
  *
- * Copyright (C) 2021 ownCloud GmbH.
- * <p>
+ * Copyright (C) 2023 ownCloud GmbH.
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
  * as published by the Free Software Foundation.
- * <p>
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * <p>
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -131,6 +131,45 @@ class SettingsMoreViewModelTest : ViewModelTest() {
         }
     }
 
+    @Test
+    fun `is access doc provider - ok - true`() {
+        every { contextProvider.getBoolean(any()) } returns true
+
+        val accessDocProviderEnabled = moreViewModel.isDocProviderAppEnabled()
+
+        assertTrue(accessDocProviderEnabled)
+
+        verify(exactly = 1) {
+            contextProvider.getBoolean(R.bool.access_document_provider_app_enabled)
+        }
+    }
+
+    @Test
+    fun `is access doc provider - ok - false`() {
+        every { contextProvider.getBoolean(any()) } returns false
+
+        val accessDocProviderEnabled = moreViewModel.isDocProviderAppEnabled()
+
+        assertFalse(accessDocProviderEnabled)
+
+        verify(exactly = 1) {
+            contextProvider.getBoolean(R.bool.access_document_provider_app_enabled)
+        }
+    }
+
+    @Test
+    fun `get access doc provider url - ok`() {
+        every { contextProvider.getString(any()) } returns OC_SECURE_BASE_URL
+
+        val accessDocProviderUrl = moreViewModel.getDocProviderAppUrl()
+
+        assertEquals(OC_SECURE_BASE_URL, accessDocProviderUrl)
+
+        verify(exactly = 1) {
+            contextProvider.getString(R.string.url_document_provider_app)
+        }
+    }
+
     @Test
     fun `is recommend enabled - ok - true`() {
         every { contextProvider.getBoolean(any()) } returns true