fix bug when get current fragments with new navigation component.

README.md

@@ -6,11 +6,11 @@
 ## **Features**
 
  - Navigate to current active activity in your IDE
+ -  Current BackStack Activities 
  -  Navigate to current  active fragments 
  -  Clear application data 
  -  Enable and Disable Permissions of your application
- - Kill or
-   Reopen Application
+ - Kill or Restart Application
 
 ## Download
 

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.wahdan'
-version '1.0.1'
+version '1.0.2'
 
 repositories {
     jcenter()
@@ -45,11 +45,6 @@ patchPluginXml {
       
 <ul>
 <li><a href="#spockadb">SpockAdb</a>
-<ul>
-<li><a href="#features">Features</a></li>
-<li><a href="#download">Download</a></li>
-<li><a href="#demo">Demo</a></li>
-</ul>
 </li>
 </ul>
 
@@ -62,11 +57,11 @@ patchPluginXml {
 <h2 id="features"><strong>Features</strong></h2>
 <ul>
 <li>Navigate to current active activity in your IDE</li>
+<li>show current back satck  </li>
 <li>Navigate to current  active fragments</li>
 <li>Clear application data</li>
 <li>Enable and Disable Permissions of your application  -Kill Application</li>
-<li>Kill or<br>
-Reopen Application</li>
+<li>Kill or Reopen Application</li>
 </ul>
 <h2 id="download">Download</h2>
 <p><a href="https://plugins.jetbrains.com/plugin/11591-spock-adb">https://plugins.jetbrains.com/plugin/11591-spock-adb</a></p>
@@ -90,7 +85,5 @@ limitations under the License.
     </div>
   </div>
 
-
-
 </body></html> """
 }   

src/main/kotlin/spock/adb/AdbControllerImp.kt

@@ -50,7 +50,7 @@ class AdbControllerImp(
             GetBackStackCommand().execute(Any(), project, device)
         val list = JBList(activitiesClass.mapIndexed
         { index, className -> "$index-$className" })
-        showClassPopup("Activities", list, activitiesClass.map { it.psiClassByNameFromProjct(project) })
+        showClassPopup("Activities", list, activitiesClass.map { it?.psiClassByNameFromProjct(project) })
 
     }
 
@@ -75,10 +75,13 @@ class AdbControllerImp(
         error: (message: String) -> Unit
     ) {
         execute({
+            val applicationID = getApplicationID(device)
+
             val fragmentsClass =
-                GetFragmentsCommand().execute(Any(), project, device) ?: throw NotFoundException("Class Not Found")
+                GetFragmentsCommand().execute(applicationID, project, device)
+                    ?: throw NotFoundException("Class Not Found")
             if (fragmentsClass.size > 1) {
-                val list = JBList(fragmentsClass.map { it1 -> it1.toString().split(":").lastOrNull() })
+                val list = JBList(fragmentsClass.map { it1 -> it1.toString().split(":").lastOrNull() ?: "" })
                 showClassPopup("Fragments", list, fragmentsClass.map { it?.psiClassByNameFromCache(project) })
             } else {
                 fragmentsClass.firstOrNull()?.let {
@@ -166,7 +169,7 @@ class AdbControllerImp(
 
     private fun showClassPopup(
         title: String,
-        list: JBList<String?>,
+        list: JBList<String>,
         classes: List<PsiClass?>
     ) {
         PopupChooserBuilder<String>(list).apply {

src/main/kotlin/spock/adb/SpockAdbViewer.kt

@@ -62,7 +62,7 @@ class SpockAdbViewer(private val  adbController: AdbController
             }
         }
 
-        permissionButton.addActionListener { it ->
+        permissionButton.addActionListener {
             selectedIDevice?.let {device->
                adbController.getApplicationPermissions(device,{
                    val dialog = PermissionDialog(device,adbController,it)

src/main/kotlin/spock/adb/command/GetBackStackCommand.kt

@@ -6,7 +6,7 @@ import spock.adb.ShellOutputReceiver
 import java.util.concurrent.TimeUnit
 
 class GetBackStackCommand : Command<Any, List<String?>> {
-    override fun execute(p: Any, project: Project, device: IDevice): List<String> {
+    override fun execute(p: Any, project: Project, device: IDevice): List<String?> {
         val shellOutputReceiver = ShellOutputReceiver()
         device.executeShellCommand(
             "dumpsys activity activities | sed -En -e '/Running activities/,/Run #0/p'",

src/main/kotlin/spock/adb/command/GetFragmentsCommand.kt

@@ -5,24 +5,24 @@ import com.intellij.openapi.project.Project
 import spock.adb.ShellOutputReceiver
 import java.util.concurrent.TimeUnit
 
-class GetFragmentsCommand : Command<Any, List<String?>?> {
-    override fun execute(p: Any, project: Project, device: IDevice): List<String?>? {
+class GetFragmentsCommand : Command<String, List<String?>?> {
+    override fun execute(p: String, project: Project, device: IDevice): List<String?>? {
         val shellOutputReceiver = ShellOutputReceiver()
         device.executeShellCommand("dumpsys activity top", shellOutputReceiver, 15L, TimeUnit.SECONDS)
-       return  getCurrentFragmentsFromLog(shellOutputReceiver)
+        return getCurrentFragmentsFromLog(shellOutputReceiver)
 
 
     }
 
-    private fun getCurrentFragmentsFromLog(shellOutputReceiver: ShellOutputReceiver):List<String>? {
-        return shellOutputReceiver.toString().split("Added Fragments:").lastOrNull()?.split("\n")
-            ?.filter {
-                it.contains("#")
-            }?.map {
-                it.split("{").first()
-                    .split(" ")
-                    .last()
-            }?.filter { !it.contains(".") }?.distinct()
+    private fun getCurrentFragmentsFromLog(shellOutputReceiver: ShellOutputReceiver): List<String>? {
+        val task = shellOutputReceiver.toString().split("TASK").lastOrNull()
+        val addedFragments = if (task?.contains("NavHostFragment") == true)
+            task.split("Added Fragments:")[2]
+        else task?.split("Added Fragments:")?.lastOrNull()
+        return addedFragments?.lines()?.map { it.trim() }
+            ?.filter { (it.startsWith("#") && !it.contains("BackStackEntry")) }
+            ?.map { it.split("{").first().split(" ").last() }?.distinct()
+
     }
 
 }

src/test/kotlin/spock/adb/command/GetFragmentsCommandTest.kt

@@ -0,0 +1,3 @@
+package spock.adb.command
+
+class GetFragmentsCommandTest