Use clean internal link when server mod_rewrite_working is true

app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt

@@ -38,6 +38,8 @@ import com.owncloud.android.lib.resources.shares.OCShare.Companion.NO_PERMISSION
 import com.owncloud.android.lib.resources.shares.OCShare.Companion.READ_PERMISSION_FLAG
 import com.owncloud.android.lib.resources.shares.OCShare.Companion.SHARE_PERMISSION_FLAG
 import com.owncloud.android.lib.resources.shares.ShareType
+import com.owncloud.android.lib.resources.status.CapabilityBooleanType
+import com.owncloud.android.lib.resources.status.OCCapability
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.fragment.util.SharePermissionManager
 import com.owncloud.android.utils.ScreenshotTest
@@ -46,6 +48,8 @@ import org.hamcrest.CoreMatchers.anyOf
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.not
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -892,4 +896,55 @@ class FileDetailSharingFragmentIT : AbstractIT() {
             assertEquals("Failed for permission: $permission", expected, SharePermissionManager.isFileRequest(share))
         }
     }
+
+    @Test
+    fun internalLinkUsesPrettyPathWhenModRewriteWorking() {
+        launchActivity<TestActivity>().use { scenario ->
+            var sut: FileDetailSharingFragment? = null
+            scenario.onActivity { activity ->
+                sut = FileDetailSharingFragment.newInstance(file, user)
+                activity.addFragment(sut)
+                activity.supportFragmentManager.executePendingTransactions()
+            }
+
+            val capabilities = OCCapability().apply { modRewriteWorking = CapabilityBooleanType.TRUE }
+            val link = sut!!.createInternalLink(user, file, capabilities)
+
+            assertTrue(link.endsWith("/f/" + file.localId))
+            assertFalse(link.contains("/index.php/"))
+        }
+    }
+
+    @Test
+    fun internalLinkUsesDefaultPathWhenModRewriteNotWorking() {
+        launchActivity<TestActivity>().use { scenario ->
+            var sut: FileDetailSharingFragment? = null
+            scenario.onActivity { activity ->
+                sut = FileDetailSharingFragment.newInstance(file, user)
+                activity.addFragment(sut)
+                activity.supportFragmentManager.executePendingTransactions()
+            }
+
+            val capabilities = OCCapability().apply { modRewriteWorking = CapabilityBooleanType.FALSE }
+            val link = sut!!.createInternalLink(user, file, capabilities)
+
+            assertTrue(link.endsWith("/index.php/f/" + file.localId))
+        }
+    }
+
+    @Test
+    fun internalLinkFallsBackToDefaultPathWhenCapabilitiesNull() {
+        launchActivity<TestActivity>().use { scenario ->
+            var sut: FileDetailSharingFragment? = null
+            scenario.onActivity { activity ->
+                sut = FileDetailSharingFragment.newInstance(file, user)
+                activity.addFragment(sut)
+                activity.supportFragmentManager.executePendingTransactions()
+            }
+
+            val link = sut!!.createInternalLink(user, file, null)
+
+            assertTrue(link.endsWith("/index.php/f/" + file.localId))
+        }
+    }
 }

app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt

@@ -97,8 +97,9 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 95, to = 96),
         AutoMigration(from = 96, to = 97, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
         // manual migration used for 97 to 98
-        AutoMigration(from = 98, to = 99)
+        AutoMigration(from = 98, to = 99),
         // manual migration used for 99 to 100
+        AutoMigration(from = 100, to = 101, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
     ],
     exportSchema = true
 )

app/src/main/java/com/nextcloud/client/database/entity/CapabilityEntity.kt

@@ -151,7 +151,9 @@ data class CapabilityEntity(
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_HAS_VALID_SUBSCRIPTION)
     val hasValidSubscription: Int?,
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_CLIENT_INTEGRATION_JSON)
-    val clientIntegrationJson: String?
+    val clientIntegrationJson: String?,
+    @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_MOD_REWRITE_WORKING)
+    val modRewriteWorking: Int?
 )
 
 @Suppress("LongMethod", "ReturnCount")
@@ -232,6 +234,7 @@ fun CapabilityEntity?.toOCCapability(): OCCapability {
     capability.defaultPermissions = this.defaultPermissions ?: 0
     capability.hasValidSubscription = intToBoolean(this.hasValidSubscription)
     capability.clientIntegrationJson = this.clientIntegrationJson
+    capability.modRewriteWorking = intToBoolean(this.modRewriteWorking)
 
     return capability
 }

app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -2415,6 +2415,8 @@ private ContentValues createContentValues(String accountName, OCCapability capab
 
         contentValues.put(ProviderTableMeta.CAPABILITIES_CLIENT_INTEGRATION_JSON, capability.getClientIntegrationJson());
 
+        contentValues.put(ProviderTableMeta.CAPABILITIES_MOD_REWRITE_WORKING, capability.getModRewriteWorking().getValue());
+
         return contentValues;
     }
 
@@ -2612,6 +2614,8 @@ private OCCapability createCapabilityInstance(Cursor cursor) {
             capability.setHasValidSubscription(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_HAS_VALID_SUBSCRIPTION));
 
             capability.setClientIntegrationJson(getString(cursor, ProviderTableMeta.CAPABILITIES_CLIENT_INTEGRATION_JSON));
+
+            capability.setModRewriteWorking(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_MOD_REWRITE_WORKING));
         }
 
         return capability;

app/src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -23,7 +23,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 100;
+    public static final int DB_VERSION = 101;
 
     private ProviderMeta() {
         // No instance
@@ -293,6 +293,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String CAPABILITIES_DEFAULT_PERMISSIONS = "default_permissions";
         public static final String CAPABILITIES_HAS_VALID_SUBSCRIPTION = "has_valid_subscription";
         public static final String CAPABILITIES_CLIENT_INTEGRATION_JSON = "client_integration_json";
+        public static final String CAPABILITIES_MOD_REWRITE_WORKING = "mod_rewrite_working";
 
         //Columns of Uploads table
         public static final String UPLOADS_LOCAL_PATH = "local_path";

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.kt

@@ -47,7 +47,6 @@ import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.SharesType
 import com.owncloud.android.datamodel.e2e.v2.decrypted.DecryptedFolderMetadataFile
-import com.owncloud.android.lib.common.OwnCloudAccount
 import com.owncloud.android.lib.common.accounts.AccountUtils
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
@@ -495,8 +494,15 @@ class FileDetailSharingFragment :
         binding.sharedWithYouNoteContainer.visibility = View.GONE
     }
 
-    private fun createInternalLink(account: OwnCloudAccount, file: OCFile): String =
-        account.baseUri.toString() + "/index.php/f/" + file.localId
+    @VisibleForTesting
+    internal fun createInternalLink(user: User, file: OCFile, capabilities: OCCapability?): String {
+        val linkPath = if (capabilities?.modRewriteWorking?.isTrue == true) {
+            INTERNAL_LINK_PATH_PRETTY
+        } else {
+            INTERNAL_LINK_PATH_DEFAULT
+        }
+        return user.server.uri.toString() + linkPath + file.localId
+    }
 
     private fun showSendLinkTo(publicShare: OCShare) {
         val file = file ?: return
@@ -685,14 +691,14 @@ class FileDetailSharingFragment :
     }
 
     override fun copyInternalLink() {
-        val account = accountManager.getCurrentOwnCloudAccount()
+        val user = user
 
-        if (account == null) {
+        if (user == null) {
             DisplayUtils.showSnackMessage(this, R.string.could_not_retrieve_url)
             return
         }
 
-        file?.let { FileActivity.showShareLinkDialog(fileActivity, file, createInternalLink(account, it)) }
+        file?.let { FileActivity.showShareLinkDialog(fileActivity, file, createInternalLink(user, it, capabilities)) }
     }
 
     private fun OCCapability?.isPasswordEnforced(): Boolean =
@@ -891,6 +897,8 @@ class FileDetailSharingFragment :
         private const val ARG_FILE = "FILE"
         private const val ARG_USER = "USER"
         private const val MIN_SHOW_ALL_VISIBLE_ITEM_COUNT = 3
+        private const val INTERNAL_LINK_PATH_PRETTY = "/f/"
+        private const val INTERNAL_LINK_PATH_DEFAULT = "/index.php/f/"
 
         @JvmStatic
         fun newInstance(file: OCFile?, user: User?): FileDetailSharingFragment = FileDetailSharingFragment().apply {

gradle/libs.versions.toml

@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "0.33.2"
 androidGifDrawableVersion = "1.2.32"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="0282f675c8f11af9f1da91436f1fa95abe2333fe"
+androidLibraryVersion ="84ab41d20310662a6bcccdd69c488d44795cd7df"
 androidOpensslVersion = "3.5.6"
 androidPluginVersion = "9.2.1"
 androidsvgVersion = "1.4"