Merge remote-tracking branch 'upstream/master' into toggle_wifi_mobile

# Conflicts:
#	src/main/kotlin/com/developerphil/adbidea/adb/AdbFacade.kt

Author: tiwiz

src/main/kotlin/com/developerphil/adbidea/action/ClearDataAndRestartWithDebuggerAction.kt

@@ -0,0 +1,14 @@
+package com.developerphil.adbidea.action
+
+import com.developerphil.adbidea.adb.AdbFacade
+import com.developerphil.adbidea.adb.AdbUtil
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.project.Project
+
+class ClearDataAndRestartWithDebuggerAction : AdbAction() {
+    override fun actionPerformed(e: AnActionEvent, project: Project) = AdbFacade.clearDataAndRestartWithDebugger(project)
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabled = AdbUtil.isDebuggingAvailable
+    }
+}

src/main/kotlin/com/developerphil/adbidea/adb/AdbFacade.kt

@@ -23,6 +23,7 @@ object AdbFacade {
     fun restartDefaultActivityWithDebugger(project: Project) = executeOnDevice(project, CommandList(KillCommand(), StartDefaultActivityCommand(true)))
     fun clearData(project: Project) = executeOnDevice(project, ClearDataCommand())
     fun clearDataAndRestart(project: Project) = executeOnDevice(project, ClearDataAndRestartCommand())
+    fun clearDataAndRestartWithDebugger(project: Project) = executeOnDevice(project, ClearDataAndRestartWithDebuggerCommand())
     fun enableWifi(project: Project) = executeOnDevice(project, ToggleSvcCommand(WIFI, true))
     fun disableWifi(project: Project) = executeOnDevice(project, ToggleSvcCommand(WIFI, false))
     fun enableMobile(project: Project) = executeOnDevice(project, ToggleSvcCommand(MOBILE, true))

src/main/kotlin/com/developerphil/adbidea/adb/command/ClearDataAndRestartCommand.kt

@@ -1,3 +1,3 @@
 package com.developerphil.adbidea.adb.command
 
-class ClearDataAndRestartCommand : CommandList(ClearDataCommand(), StartDefaultActivityCommand(false))
+class ClearDataAndRestartCommand : CommandList(ClearDataCommand(), StartDefaultActivityCommand(false))

src/main/kotlin/com/developerphil/adbidea/adb/command/ClearDataAndRestartWithDebuggerCommand.kt

@@ -0,0 +1,3 @@
+package com.developerphil.adbidea.adb.command
+
+class ClearDataAndRestartWithDebuggerCommand : CommandList(ClearDataCommand(), StartDefaultActivityCommand(true))

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

@@ -201,6 +201,12 @@
                     text="ADB Restart App With Debugger"
                     description="Restarts the current application and attach the debugger">
             </action>
+
+            <action id="com.developerphil.adbidea.action.ClearDataAndRestartWithDebuggerAction"
+                    class="com.developerphil.adbidea.action.ClearDataAndRestartWithDebuggerAction"
+                    text="ADB Clear App Data and Restart App With Debugger"
+                    description="Clears the private storage of the app and restarts it, and attach the debugger">
+            </action>
             <add-to-group group-id="AndroidToolsGroup" anchor="first"/>
             <separator/>