Improve WSA connection status checks

alesimula · Dec 21, 2021 · ff3ed07 · ff3ed07
1 parent cdcf58d
commit ff3ed07
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/apk_installer.dart b/lib/apk_installer.dart
@@ -75,7 +75,7 @@ class _ApkInstallerState extends State<ApkInstaller> {
     Widget? aForeground = GState.apkForegroundIcon.of(context);
     Widget? lIcon = GState.apkIcon.of(context);
     WSAStatusAlert connectionStatus = GState.connectionStatus.of(context);
-    bool isConnected = connectionStatus.severity == InfoBarSeverity.success;
+    bool isConnected = connectionStatus.isConnected;
     InstallType? installType = GState.apkInstallType.of(context);
     bool canInstall = isConnected && installType != null && installType != InstallType.UNKNOWN;
     InstallState installState = GState.apkInstallState.of(context);

diff --git a/lib/main.dart b/lib/main.dart
@@ -58,6 +58,9 @@ class WSAStatusAlert {
       // Do nothing for now
     }(),
   );
+
+  bool get isConnected => type == ConnectionStatus.CONNECTED;
+  bool get isDisconnected => type != ConnectionStatus.CONNECTED;
 }
 
 enum ConnectionStatus {

diff --git a/lib/screens/wsa.dart b/lib/screens/wsa.dart
@@ -79,7 +79,7 @@ class _ScreenWSAState extends State<ScreenWSA> {
             padding: const EdgeInsets.all(8.0),
             child: Row(children: [
             Expanded(
-              child: Button(child: const Text('Manage Applications'), onPressed: connectionStatus.severity != InfoBarSeverity.success ? 
+              child: Button(child: const Text('Manage Applications'), onPressed: connectionStatus.isDisconnected ? 
                 null : () => Process.run('${Env.TOOLS_DIR}\\adb.exe', ['-s', '${GState.ipAddress.of(context)}:${GState.androidPort.of(context)}', 
                   'shell', r'am start com.android.settings/.Settings\$ManageApplicationsActivity'])
               ),
@@ -90,7 +90,7 @@ class _ScreenWSAState extends State<ScreenWSA> {
             padding: const EdgeInsets.all(8.0),
             child: Row(children: [
             Expanded(
-              child: Button(child: const Text('Manage Settings'), onPressed: connectionStatus.severity != InfoBarSeverity.success ?
+              child: Button(child: const Text('Manage Settings'), onPressed: connectionStatus.isDisconnected ?
                 null : () => Process.run('${Env.TOOLS_DIR}\\adb.exe', ['-s', '${GState.ipAddress.of(context)}:${GState.androidPort.of(context)}', 
                   'shell', r'am start com.android.settings/.Settings']) ),
             )