Merge pull request #190 from deepueg/fix-onfocus-rn64

Fix onfocus rn64

Author: deepueg

android/lib/build.gradle

@@ -27,6 +27,10 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
 }
 
 dependencies {

android/lib/src/androidTest/java/com/ern/api/impl/LaunchConfigTests.java

@@ -4,6 +4,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.ViewAssertion;
@@ -269,12 +270,19 @@ public void check(View view, NoMatchingViewException noViewFoundException) {
             }
         });
         onView(withContentDescription(R.string.abc_action_bar_up_description)).perform(click());
-        scenario.onActivity(new ActivityScenario.ActivityAction<UpEnabledForRootActivity>() {
-            @Override
-            public void perform(UpEnabledForRootActivity activity) {
-                assertThat(activity.isFinishing()).isTrue();
-            }
-        });
+        Lifecycle.State state = scenario.getState();
+        // Sometimes the activity gets destroyed immediately ot it can be delayed.
+        // Covering both cases below.
+        if(state == Lifecycle.State.STARTED) {
+            scenario.onActivity(new ActivityScenario.ActivityAction<UpEnabledForRootActivity>() {
+                @Override
+                public void perform(UpEnabledForRootActivity activity) {
+                    assertThat(activity.isFinishing()).isTrue();
+                }
+            });
+        } else {
+            assertThat(scenario.getState()).isEqualTo(Lifecycle.State.DESTROYED);
+        }
     }
 
     @Test

android/lib/src/androidTest/java/com/ern/api/impl/NavigationFragmentDelegateTest.java

@@ -7,6 +7,7 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
+import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -84,7 +85,7 @@ public void perform(TestActivity activity) {
                 assertThat(fragment).isInstanceOf(LayoutConfiguredFragment.class);
                 LayoutConfiguredFragment testFragment = (LayoutConfiguredFragment) fragment;
                 assertThat(testFragment.getView()).isNotNull();
-                assertThat(testFragment.getView().findViewById(com.walmartlabs.ern.navigation.test.R.id.miniapp_view_container)).isNotNull();
+                assertThat((LinearLayout) testFragment.getView().findViewById(com.walmartlabs.ern.navigation.test.R.id.miniapp_view_container)).isNotNull();
             }
         });
     }

android/lib/src/main/java/com/ern/api/impl/navigation/ElectrodeNavigationFragmentDelegate.java

@@ -2,6 +2,8 @@
 
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -59,6 +61,8 @@ public class ElectrodeNavigationFragmentDelegate<T extends ElectrodeBaseFragment
 
     protected boolean ignoreRnNavBarUpdate;
 
+    private Handler mMainHandler = new Handler(Looper.getMainLooper());
+
     private final Observer<Route> routeObserver = new Observer<Route>() {
         @Override
         public void onChanged(@Nullable Route route) {
@@ -170,7 +174,7 @@ public void onResume() {
         if (mNavViewModel != null) {
             mNavViewModel.registerNavRequestHandler();
         }
-        EnNavigationApi.events().emitNavEvent(new NavEventData.Builder(NavEventType.DID_FOCUS.toString()).viewId(getMiniAppViewIdentifier()).build());
+        mMainHandler.post(() -> EnNavigationApi.events().emitNavEvent(new NavEventData.Builder(NavEventType.DID_FOCUS.toString()).viewId(getMiniAppViewIdentifier()).build()));
     }
 
     @SuppressWarnings("unused")
@@ -204,7 +208,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
     @CallSuper
     public void onPause() {
         super.onPause();
-        EnNavigationApi.events().emitNavEvent(new NavEventData.Builder(NavEventType.DID_BLUR.toString()).viewId(getMiniAppViewIdentifier()).build());
+        mMainHandler.post(() -> EnNavigationApi.events().emitNavEvent(new NavEventData.Builder(NavEventType.DID_BLUR.toString()).viewId(getMiniAppViewIdentifier()).build()));
     }
 
     @Override