Skip to content

Commit 33a9af4

Browse files
committed
fix(UrlFile): Supports .URL and .WEBLOC
1 parent a7272c0 commit 33a9af4

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

app/src/main/java/com/infomaniak/drive/data/models/File.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@ import com.infomaniak.drive.data.models.file.FileConversion
3333
import com.infomaniak.drive.data.models.file.FileExternalImport
3434
import com.infomaniak.drive.data.models.file.FileExternalImport.FileExternalImportStatus
3535
import com.infomaniak.drive.data.models.file.FileVersion
36-
import com.infomaniak.drive.utils.AccountUtils
37-
import com.infomaniak.drive.utils.IOFile
36+
import com.infomaniak.drive.utils.*
3837
import com.infomaniak.drive.utils.RealmListParceler.*
3938
import com.infomaniak.drive.utils.Utils.INDETERMINATE_PROGRESS
4039
import com.infomaniak.drive.utils.Utils.ROOT_ID
41-
import com.infomaniak.drive.utils.downloadFile
4240
import com.infomaniak.lib.core.utils.contains
4341
import com.infomaniak.lib.core.utils.guessMimeType
4442
import io.realm.RealmList
@@ -240,7 +238,7 @@ open class File(
240238
return if (extension == name) null else ".$extension"
241239
}
242240

243-
fun isBookmark() = name.endsWith(".url") || name.endsWith(".webloc")
241+
fun isBookmark() = name.isUrlFile() || name.isWeblocFile()
244242

245243
fun isPendingUploadFolder() = isFromUploads && isFolder()
246244

app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ class SaveExternalFilesActivity : BaseActivity() {
450450
if (outputFile.createNewFile()) {
451451
outputFile.setLastModified(lastModified.time)
452452

453-
if (fileName.endsWith(".url")) { // Create url file
453+
if (fileName.isUrlFile()) { // Create url file
454454
// See URL format http://www.lyberty.com/encyc/articles/tech/dot_url_format_-_an_unofficial_guide.html
455455
outputFile.outputStream().use { output ->
456456
output.write("[InternetShortcut]".toByteArray())

app/src/main/java/com/infomaniak/drive/utils/Extensions.kt

+4
Original file line numberDiff line numberDiff line change
@@ -551,3 +551,7 @@ fun MainActivity.showQuotasExceededSnackbar(navController: NavController) {
551551
onActionClicked = { navController.openMyKSuiteUpgradeBottomSheet(KSuiteApp.Drive) },
552552
)
553553
}
554+
555+
fun String.isUrlFile() = endsWith(".url", ignoreCase = true)
556+
557+
fun String.isWeblocFile() = endsWith(".webloc", ignoreCase = true)

app/src/main/java/com/infomaniak/drive/utils/FilePresenter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ object FilePresenter {
127127

128128
suspend fun Context.openBookmarkIntent(fileName: String, uri: Uri) {
129129
val url = withContext(Dispatchers.IO) {
130-
if (fileName.endsWith(".url")) {
130+
if (fileName.isUrlFile()) {
131131
getUrlFromUrlFile(context = this@openBookmarkIntent, uri)
132132
} else {
133133
getUrlFromWebloc(context = this@openBookmarkIntent, uri)

0 commit comments

Comments
 (0)