From 0fb16aeef62a8e70837cdacdc2787571b8aece37 Mon Sep 17 00:00:00 2001
From: Naman Dwivedi <namandwivedi14@gmail.com>
Date: Mon, 29 May 2017 16:33:40 +0530
Subject: [PATCH] tcp connection status

---
 adbhelper.js              |  9 +++++++++
 extension.js              | 23 ++++++++++++++++++++---
 icons/bug_report_icon.svg |  4 ++++
 icons/remote_icon.svg     |  4 ++++
 icons/remote_off_icon.svg |  4 ++++
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 icons/bug_report_icon.svg
 create mode 100644 icons/remote_icon.svg
 create mode 100644 icons/remote_off_icon.svg

diff --git a/adbhelper.js b/adbhelper.js
index 1211c4f..5ccf8d5 100644
--- a/adbhelper.js
+++ b/adbhelper.js
@@ -49,6 +49,10 @@ function getDeviceDetail(deviceId) {
         }
 }
 
+function startDaemon() {
+        GLib.spawn_async(null, ["bash", "-c", "adb devices"], null, GLib.SpawnFlags.SEARCH_PATH, null, null);
+
+}
 
 function takeScreenshot(deviceId) {
     let time = '$(date +%Y-%m-%d-%H:%M)'
@@ -79,6 +83,11 @@ function establishTCPConnection(deviceId) {
 
 }
 
+function useUsb() {
+    let [res, out, error] = GLib.spawn_async(null, ["bash", "-c", "adb usb"], null, GLib.SpawnFlags.SEARCH_PATH, null, null);
+
+}
+
 function getDeviceIp(deviceId) {
      let [res, out, error] = GLib.spawn_sync(null, ["bash", "-c", "adb -s "+ deviceId +" shell ip route | awk '{print $9}'"], null, GLib.SpawnFlags.SEARCH_PATH, null, null);
      return out.toString().trim();
diff --git a/extension.js b/extension.js
index a06b33f..e3a3cad 100644
--- a/extension.js
+++ b/extension.js
@@ -19,6 +19,7 @@ const Me = ExtensionUtils.getCurrentExtension();
 const AdbHelper = Me.imports.adbhelper;
 
 let screenRecord = {recording: false, deviceId: 0};
+let tcpConnection ={connected: false};
 
 const AndroidMenuItem = new Lang.Class({
     Name: 'AndroidMenuItem',
@@ -71,6 +72,7 @@ const AndroidMenu = new Lang.Class({
         this.actor.connect('button-press-event', Lang.bind(this,this._findDevices));
 
         this._addErrorItem("No devices found");
+        AdbHelper.startDaemon();
     
     },
 
@@ -117,8 +119,15 @@ const AndroidMenu = new Lang.Class({
     },
 
     _connectTCP: function(device) {
-        let status = AdbHelper.establishTCPConnection(device.deviceId)
-        Main.notify(status)
+
+        if(tcpConnection.connected) {
+            lAdbHelper.useUsb();
+            tcpConnection.connected = false;
+        } else {
+            let status = AdbHelper.establishTCPConnection(device.deviceId);
+            tcpConnection.connected = true;
+            Main.notify(status);
+        }
     },
 
     _addMenuItems: function(devices) {
@@ -156,7 +165,15 @@ const AndroidMenu = new Lang.Class({
                     }));
                     section.addMenuItem(recordScreenItem);
 
-                    let remoteItem = new AndroidMenuItem({label: "Establish remote connection", icon: "android_icon"});
+                    let remoteLabel = "Establish remote connection"
+                    let remoteIcon = "remote_icon"
+
+                    if(tcpConnection.connected) {
+                        remoteLabel = "Connected over TCP. Click to use USB instead";
+                        remoteIcon = 'remote_off_icon'
+                    }
+
+                    let remoteItem = new AndroidMenuItem({label: remoteLabel, icon: remoteIcon});
 
                     remoteItem.connect('activate', Lang.bind(this, function() {
                         this._connectTCP(device)
diff --git a/icons/bug_report_icon.svg b/icons/bug_report_icon.svg
new file mode 100644
index 0000000..f599e66
--- /dev/null
+++ b/icons/bug_report_icon.svg
@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M20 8h-2.81c-.45-.78-1.07-1.45-1.82-1.96L17 4.41 15.59 3l-2.17 2.17C12.96 5.06 12.49 5 12 5c-.49 0-.96.06-1.41.17L8.41 3 7 4.41l1.62 1.63C7.88 6.55 7.26 7.22 6.81 8H4v2h2.09c-.05.33-.09.66-.09 1v1H4v2h2v1c0 .34.04.67.09 1H4v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3H20v-2h-2.09c.05-.33.09-.66.09-1v-1h2v-2h-2v-1c0-.34-.04-.67-.09-1H20V8zm-6 8h-4v-2h4v2zm0-4h-4v-2h4v2z"/>
+</svg>
\ No newline at end of file
diff --git a/icons/remote_icon.svg b/icons/remote_icon.svg
new file mode 100644
index 0000000..657fd56
--- /dev/null
+++ b/icons/remote_icon.svg
@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12.01 21.49L23.64 7c-.45-.34-4.93-4-11.64-4C5.28 3 .81 6.66.36 7l11.63 14.49.01.01.01-.01z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>
\ No newline at end of file
diff --git a/icons/remote_off_icon.svg b/icons/remote_off_icon.svg
new file mode 100644
index 0000000..94aab42
--- /dev/null
+++ b/icons/remote_off_icon.svg
@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M23.64 7c-.45-.34-4.93-4-11.64-4-1.5 0-2.89.19-4.15.48L18.18 13.8 23.64 7zm-6.6 8.22L3.27 1.44 2 2.72l2.05 2.06C1.91 5.76.59 6.82.36 7l11.63 14.49.01.01.01-.01 3.9-4.86 3.32 3.32 1.27-1.27-3.46-3.46z"/>
+</svg>
\ No newline at end of file