Merge pull request #11 from rasoulmiri/develop

Fix show error connect an android device

Author: rasoulmiri

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.androidstudiotoolsmissed"
-version = "1.0.4-SNAPSHOT"
+version = "1.0.5"
 
 repositories {
     mavenCentral()
@@ -85,6 +85,7 @@ tasks {
             properties.load(inputStream)
         }
         val intelliJToken: String = properties.getProperty("token").trim()
+        println(intelliJToken)
         token.set(System.getenv(intelliJToken))
     }
 }

src/main/kotlin/androidstudio/tools/missed/manager/device/DeviceManagerImpl.kt

@@ -42,7 +42,7 @@ class DeviceManagerImpl(
         val resultGetDevice = getDevicesFromAdb()
         if (resultGetDevice.isFailure) {
             return Result.failure(
-                resultInitialAdb.exceptionOrNull() ?: Throwable(resourceManager.string("getDevicesFromAdbError"))
+                resultGetDevice.exceptionOrNull() ?: Throwable(resourceManager.string("getDevicesFromAdbError"))
             )
         }
 
@@ -71,7 +71,9 @@ class DeviceManagerImpl(
             _selectedDeviceStateFlow.emit(_devicesStateFlow.value.getOrNull(0))
             Result.success(true)
         } else {
-            Result.failure(Throwable(resourceManager.string("getDevicesFromAdbError")))
+            Result.failure(
+                resultGetDevices.exceptionOrNull() ?: Throwable(resourceManager.string("getDevicesFromAdbError"))
+            )
         }
     }
 

src/main/kotlin/androidstudio/tools/missed/missedtoolwindow/di/MissedToolsWindowModule.kt

@@ -16,7 +16,7 @@ import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 val missedToolsWindowModule = module {
-    single { MissedToolsWindowViewModel(get(named("IODispatcher")), get()) }
+    single { MissedToolsWindowViewModel(get(named("IODispatcher")), get(),get()) }
     factory<CollapsibleGroupView<*>>(named("customCommandView")) { CustomCommandView(get(), get(), get()) }
     factory<CollapsibleGroupView<*>>(named("networkView")) { NetworkView(get(), get(), get()) }
     factory<CollapsibleGroupView<*>>(named("inputTextView")) { InputTextView(get(), get(), get()) }

src/main/kotlin/androidstudio/tools/missed/missedtoolwindow/presenter/MissedToolsWindowViewModel.kt

@@ -3,6 +3,7 @@ package androidstudio.tools.missed.missedtoolwindow.presenter
 import androidstudio.tools.missed.base.ViewModel
 import androidstudio.tools.missed.manager.device.DeviceManager
 import androidstudio.tools.missed.manager.notification.model.BalloonNotificationModel
+import androidstudio.tools.missed.manager.resource.ResourceManager
 import androidstudio.tools.missed.missedtoolwindow.model.MissedToolsWindowStateUi
 import com.intellij.notification.NotificationType
 import kotlinx.coroutines.CoroutineDispatcher
@@ -20,6 +21,7 @@ import kotlinx.coroutines.launch
 
 class MissedToolsWindowViewModel(
     private val coroutineDispatcher: CoroutineDispatcher,
+    private val resourceManager: ResourceManager,
     private val deviceManager: DeviceManager
 ) : ViewModel(coroutineDispatcher) {
 
@@ -59,7 +61,12 @@ class MissedToolsWindowViewModel(
                 _messageSharedFlow.emit(
                     BalloonNotificationModel(content = it.message, type = NotificationType.ERROR)
                 )
-                _uiStateFlow.emit(MissedToolsWindowStateUi.Error)
+
+                if (it.message == resourceManager.string("connectAnAndroidDevice")) {
+                    _uiStateFlow.emit(MissedToolsWindowStateUi.NeedToConnectDevice)
+                } else {
+                    _uiStateFlow.emit(MissedToolsWindowStateUi.Error)
+                }
             }
         }
     }

src/main/resources/META-INF/plugin.xml

@@ -4,38 +4,18 @@
     <vendor email="[email protected]" url="[email protected]">Rasoul Miri</vendor>
 
     <description>
-        <![CDATA[<p>You can use AndroidStudioToolsMissed plugin during the development of Android applications, such as granting and revoking all permissions and activating and deactivating Wi-Fi, cellular mobile, Bluetooth, or Airplane mode
-<br>You can also set the Doze mode, Standby, and whitelist, or you can simulate the battery settings.</p>
-<p><strong style="color: blue;">All these features are available for emulators and real Android devices.</strong></p>
-
-<strong>Features:</strong>
+        <![CDATA[
+<p>The AndroidStudioToolsMissed plugin enhances Android application development by providing tools to manage device settings and permissions. With this plugin, you can:</p>
 <ul>
-  <li><strong>Network</strong>
-    <ul>
-      <li>Airplane Mode</li>
-      <li>Mobile Cellular</li>
-      <li>Wifi Connection</li>
-      <li>Bluetooth</li>
-    </ul>
-  </li>
-  <li><strong>Input Text:</strong> You can send your text to an Android device.</li>
-  <li><strong>Permissions:</strong> You can grant or revoke permission or all permissions for an application.</li>
-  <li><strong>APK:</strong> Get Apk from which is installed on your device or install APK on a device.</li>
-  <li><strong>Limitation Modes</strong>
-    <ul>
-      <li>Doze Mode</li>
-      <li>Standby</li>
-      <li>WhiteList</li>
-    </ul>
-  </li>
-  <li><strong>Battery</strong>
-  <ul>
-  <li>Charger Connection</li>
-  <li>Battery Level</li>
-  <li>Power Saving Mode</li>
-   </ul>
-  </li>
+  <li><strong style="color: orange;">Custom Command:</strong> Execute custom shell commands directly from Android Studio.</li>
+  <li><strong style="color: orange;">Network:</strong> Manage network settings like Airplane Mode, Mobile Cellular, WiFi, and Bluetooth.</li>
+  <li><strong style="color: orange;">Input Text:</strong> Send text to your Android device.</li>
+  <li><strong style="color: orange;">Permissions:</strong> Grant or revoke permissions easily.</li>
+  <li><strong style="color: orange;">APK Management:</strong> Extract and install APKs from/to your device.</li>
+  <li><strong style="color: orange;">Limitation Modes:</strong> Control Doze Mode, Standby Mode, and WhiteList.</li>
+  <li><strong style="color: orange;">Battery:</strong> Check charger connection, battery level, and power saving mode.</li>
 </ul>
+<p><strong>Use these features on both emulators and real devices to streamline your testing and development process.</strong></p>
 ]]>
     </description>