Revert "Implement a fix for SemanticsHandles bug on Android (#1395)" (#1397)

This reverts commit 868cef3.

Author: bartekpacia

contracts.proto

@@ -38,7 +38,6 @@ message RunDartTestResponse {
 }
 
 service NativeAutomator {
-  rpc initialize(Empty) returns (Empty) {}
   rpc configure(ConfigureRequest) returns (Empty) {}
 
   // general

packages/patrol/android/src/main/kotlin/pl/leancode/patrol/Automator.kt

@@ -1,8 +1,6 @@
 package pl.leancode.patrol
 
-import android.app.Instrumentation
 import android.app.UiAutomation
-import android.content.Context
 import android.os.SystemClock
 import android.widget.EditText
 import androidx.test.platform.app.InstrumentationRegistry
@@ -52,25 +50,15 @@ private fun fromUiObject2(obj: UiObject2): Contracts.NativeView {
 class Automator private constructor() {
     private var timeoutMillis: Long = 10_000
 
-    private lateinit var instrumentation: Instrumentation
-    private lateinit var configurator: Configurator
-    private lateinit var uiDevice: UiDevice
-    private lateinit var targetContext: Context
-
-    fun initialize() {
-        instrumentation = InstrumentationRegistry.getInstrumentation()
-        targetContext = instrumentation.targetContext
-        configurator = Configurator.getInstance()
-        uiDevice = UiDevice.getInstance(instrumentation)
-    }
-
     fun configure(waitForSelectorTimeout: Long) {
+        val configurator = Configurator.getInstance()
+
         timeoutMillis = waitForSelectorTimeout
         configurator.waitForSelectorTimeout = waitForSelectorTimeout
         configurator.waitForIdleTimeout = 5000
         configurator.keyInjectionDelay = 50
 
-        configurator.uiAutomationFlags = UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES
+        Configurator.getInstance().uiAutomationFlags = UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES
 
         Logger.i("Timeout: $timeoutMillis ms")
         Logger.i("Android UiAutomator configuration:")
@@ -83,6 +71,12 @@ class Automator private constructor() {
         Logger.i("\tuiAutomationFlags: ${configurator.uiAutomationFlags}")
     }
 
+    private val instrumentation get() = InstrumentationRegistry.getInstrumentation()
+
+    private val uiDevice get() = UiDevice.getInstance(instrumentation)
+
+    private val targetContext get() = instrumentation.targetContext
+
     private fun executeShellCommand(cmd: String) {
         uiDevice.executeShellCommand(cmd)
         delay()

packages/patrol/android/src/main/kotlin/pl/leancode/patrol/AutomatorServer.kt

@@ -17,12 +17,6 @@ import pl.leancode.patrol.contracts.permissionDialogVisibleResponse
 typealias Empty = Contracts.Empty
 
 class AutomatorServer(private val automation: Automator) : NativeAutomatorGrpcKt.NativeAutomatorCoroutineImplBase() {
-
-    override suspend fun initialize(request: Empty): Empty {
-        automation.initialize()
-        return empty { }
-    }
-
     override suspend fun configure(request: Contracts.ConfigureRequest): Empty {
         automation.configure(waitForSelectorTimeout = request.findTimeoutMillis)
         return empty { }
@@ -58,7 +52,7 @@ class AutomatorServer(private val automation: Automator) : NativeAutomatorGrpcKt
         return empty { }
     }
 
-    override suspend fun closeNotifications(request: Empty): Empty {
+    override suspend fun closeNotifications(request: Contracts.Empty): Contracts.Empty {
         automation.closeNotifications()
         return empty { }
     }
@@ -208,7 +202,7 @@ class AutomatorServer(private val automation: Automator) : NativeAutomatorGrpcKt
         return empty { }
     }
 
-    override suspend fun markPatrolAppServiceReady(request: Empty): Empty {
+    override suspend fun markPatrolAppServiceReady(request: Contracts.Empty): Contracts.Empty {
         PatrolServer.appReady.set(true)
         return empty { }
     }