From cc2f599ca2445d2f895f7fb1eefb15c7a527fc96 Mon Sep 17 00:00:00 2001 From: "aman.kapoor" Date: Wed, 12 Jan 2022 14:56:17 +0530 Subject: [PATCH] Fix: create directories on Windows --- src/main/kotlin/app/MainWindow.kt | 4 +--- src/main/kotlin/inputs/adb/ddmlib/AdbHelper.kt | 12 +++++++----- src/main/kotlin/storage/StorageHelper.kt | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/app/MainWindow.kt b/src/main/kotlin/app/MainWindow.kt index 28749ab..8d6ed8a 100644 --- a/src/main/kotlin/app/MainWindow.kt +++ b/src/main/kotlin/app/MainWindow.kt @@ -1,8 +1,6 @@ package app import androidx.compose.runtime.Composable -import androidx.compose.ui.unit.DpSize -import androidx.compose.ui.unit.dp import androidx.compose.ui.window.ApplicationScope import androidx.compose.ui.window.Window import androidx.compose.ui.window.WindowPlacement @@ -30,7 +28,7 @@ fun ApplicationScope.appWindow() { } Thread.setDefaultUncaughtExceptionHandler(CustomExceptionHandler()) SentryHelper.init() - val windowState = rememberWindowState(WindowPlacement.Floating, size = DpSize(1440.dp, 1024.dp)) + val windowState = rememberWindowState(WindowPlacement.Maximized) Window(onCloseRequest = onCloseRequest, title = CustomTheme.strings.appName, state = windowState) { App() } diff --git a/src/main/kotlin/inputs/adb/ddmlib/AdbHelper.kt b/src/main/kotlin/inputs/adb/ddmlib/AdbHelper.kt index 5bd9416..fa2b6d9 100644 --- a/src/main/kotlin/inputs/adb/ddmlib/AdbHelper.kt +++ b/src/main/kotlin/inputs/adb/ddmlib/AdbHelper.kt @@ -29,15 +29,17 @@ object AdbHelper { private const val PACKAGES_COMMAND = "pm list packages -3 -e" // list of lines with format : package:com.ea.games.r3_row + private const val ADB_TIMEOUT = 10L + fun init() { val options = AdbInitOptions.builder().setClientSupportEnabled(true).build() AndroidDebugBridge.init(options) AndroidDebugBridge.addDeviceChangeListener(Devices()) val adbPath = adbPath() bridge = if (!adbPath.isNullOrBlank()) { - AndroidDebugBridge.createBridge(adbPath, false, 10, TimeUnit.SECONDS) + AndroidDebugBridge.createBridge(adbPath, false, ADB_TIMEOUT, TimeUnit.SECONDS) } else { - AndroidDebugBridge.createBridge(10, TimeUnit.SECONDS) + AndroidDebugBridge.createBridge(ADB_TIMEOUT, TimeUnit.SECONDS) } AndroidDebugBridge.addDebugBridgeChangeListener { bridge = it @@ -112,18 +114,18 @@ object AdbHelper { suspend fun getPackages(device: IDevice, onValue: (packages: List) -> Unit) = withContext(Dispatchers.IO) { device.executeShellCommand( PACKAGES_COMMAND, PackagesReceiver(onValue), - 10, TimeUnit.SECONDS + ADB_TIMEOUT, TimeUnit.SECONDS ) } private fun IDevice.emptyShellCommand(command: String) { executeShellCommand( command, - EmptyReceiver, 10, TimeUnit.SECONDS + EmptyReceiver, ADB_TIMEOUT, TimeUnit.SECONDS ) } - private fun adbPath(): String? { + fun adbPath(): String? { val androidEnvHome: File? = try { System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT") } catch (e: SecurityException) { diff --git a/src/main/kotlin/storage/StorageHelper.kt b/src/main/kotlin/storage/StorageHelper.kt index 50121fb..baf9983 100644 --- a/src/main/kotlin/storage/StorageHelper.kt +++ b/src/main/kotlin/storage/StorageHelper.kt @@ -46,9 +46,9 @@ object StorageHelper { val posixAttribute = PosixFilePermissions.asFileAttribute( PosixFilePermissions.fromString("rwxr-x---") ) - Files.createDirectory(folder.toPath(), posixAttribute) + Files.createDirectories(folder.toPath(), posixAttribute) } else { - Files.createDirectory(folder.toPath()) + Files.createDirectories(folder.toPath()) } } catch (e: IOException) { throw IOException("Cannot create app folder at path ${folder.canonicalPath}", e)