diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 388c1143..7591afb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,7 +27,6 @@ - diff --git a/app/src/main/java/com/ismartcoding/plain/features/file/FileSystemHelper.kt b/app/src/main/java/com/ismartcoding/plain/features/file/FileSystemHelper.kt index 9f2f5b8e..5441299f 100644 --- a/app/src/main/java/com/ismartcoding/plain/features/file/FileSystemHelper.kt +++ b/app/src/main/java/com/ismartcoding/plain/features/file/FileSystemHelper.kt @@ -177,7 +177,7 @@ object FileSystemHelper { if (!rawSecondaryStoragesStr.isNullOrEmpty()) { val rawSecondaryStorages = - rawSecondaryStoragesStr!!.split( + rawSecondaryStoragesStr.split( File.pathSeparator.toRegex(), ).dropLastWhile(String::isEmpty).toTypedArray() Collections.addAll(paths, *rawSecondaryStorages) @@ -304,12 +304,6 @@ object FileSystemHelper { return items.take(50) } - - private fun parseFilePermission(f: File): String { - val attributes = Files.readAttributes(f.toPath(), PosixFileAttributes::class.java, LinkOption.NOFOLLOW_LINKS) - val p = attributes.permissions() - return "" - } } fun List.sort(sortBy: FileSortBy): List { diff --git a/app/src/main/java/com/ismartcoding/plain/features/locale/LocaleHelper.kt b/app/src/main/java/com/ismartcoding/plain/features/locale/LocaleHelper.kt index 54ac102e..5a1a6875 100644 --- a/app/src/main/java/com/ismartcoding/plain/features/locale/LocaleHelper.kt +++ b/app/src/main/java/com/ismartcoding/plain/features/locale/LocaleHelper.kt @@ -13,7 +13,7 @@ object LocaleHelper { fun getString(resourceKey: Int): String { return try { - MainApp.instance.resources.getString(resourceKey) ?: "" + MainApp.instance.resources.getString(resourceKey) } catch (e: Exception) { resourceKey.toString() } @@ -57,7 +57,7 @@ object LocaleHelper { val params: MutableMap = HashMap() var i = 0 while (i < formatArguments.size) { - params[formatArguments[i].toString()] = (formatArguments[i + 1] ?: "") + params[formatArguments[i].toString()] = formatArguments[i + 1] i += 2 } tmpl.execute(params) diff --git a/app/src/main/java/com/ismartcoding/plain/ui/TextEditorDialog.kt b/app/src/main/java/com/ismartcoding/plain/ui/TextEditorDialog.kt index 117b2ea8..56417b1a 100644 --- a/app/src/main/java/com/ismartcoding/plain/ui/TextEditorDialog.kt +++ b/app/src/main/java/com/ismartcoding/plain/ui/TextEditorDialog.kt @@ -61,8 +61,7 @@ class TextEditorDialog(val uri: Uri) : BaseDialog() { setWindowSoftInput(binding.editor) lifecycleScope.launch { - var text = "" - text = + val text = if (uri.scheme == ContentResolver.SCHEME_CONTENT) { val context = requireContext() withIO { diff --git a/app/src/main/java/com/ismartcoding/plain/ui/models/WebConsoleViewModel.kt b/app/src/main/java/com/ismartcoding/plain/ui/models/WebConsoleViewModel.kt index 0c7ee605..b3c2c8e7 100644 --- a/app/src/main/java/com/ismartcoding/plain/ui/models/WebConsoleViewModel.kt +++ b/app/src/main/java/com/ismartcoding/plain/ui/models/WebConsoleViewModel.kt @@ -39,7 +39,6 @@ class WebConsoleViewModel : ViewModel() { fun dig( context: Context, - httpPort: Int, ) { viewModelScope.launch { val client = HttpClientManager.httpClient() diff --git a/app/src/main/java/com/ismartcoding/plain/ui/page/web/WebSettingsPage.kt b/app/src/main/java/com/ismartcoding/plain/ui/page/web/WebSettingsPage.kt index 36d76976..1b3b92e0 100644 --- a/app/src/main/java/com/ismartcoding/plain/ui/page/web/WebSettingsPage.kt +++ b/app/src/main/java/com/ismartcoding/plain/ui/page/web/WebSettingsPage.kt @@ -171,7 +171,7 @@ fun WebSettingsPage( }) DropdownMenuItem(onClick = { isMenuOpen = false - viewModel.dig(context, httpPort = httpPort) + viewModel.dig(context) }, text = { Text(text = stringResource(R.string.http_server_diagnostics)) }) diff --git a/lib/src/main/java/com/ismartcoding/lib/mustache/Mustache.kt b/lib/src/main/java/com/ismartcoding/lib/mustache/Mustache.kt index fabc805d..23a72b2e 100644 --- a/lib/src/main/java/com/ismartcoding/lib/mustache/Mustache.kt +++ b/lib/src/main/java/com/ismartcoding/lib/mustache/Mustache.kt @@ -755,7 +755,7 @@ object Mustache { delims: Delims, into: StringBuilder, ) { - delims.addTag('^', _name, into!!) + delims.addTag('^', _name, into) for (seg in _segs) seg.decompile(delims, into) delims.addTag('/', _name, into) } @@ -843,7 +843,7 @@ object Mustache { into: StringBuilder, ) {} // nada - override fun visit(visit: Visitor) {} + override fun visit(visitor: Visitor) {} override fun toString(): String { return "Faux"