Add second activity to demo app

* Test and fix OneSignal onStart lifecycle event, not call it when navigating between activities

Author: Jeasmine

Examples/OneSignalDemo/app/src/main/AndroidManifest.xml

@@ -84,6 +84,9 @@
 
         <activity android:name=".activity.MainActivity"/>
 
+        <activity
+          android:name=".activity.SecondaryActivity"
+          android:exported="false" />
     </application>
 
 </manifest>

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/activity/SecondaryActivity.java

@@ -0,0 +1,16 @@
+package com.onesignal.sdktest.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+import com.onesignal.sdktest.R;
+
+public class SecondaryActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_secondary);
+    }
+}

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java

@@ -9,6 +9,8 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.appcompat.widget.Toolbar;
+
+import android.content.Intent;
 import android.util.Pair;
 import android.view.View;
 import android.view.ViewTreeObserver;
@@ -25,6 +27,7 @@
 import com.onesignal.OSSubscriptionStateChanges;
 import com.onesignal.OneSignal;
 import com.onesignal.sdktest.R;
+import com.onesignal.sdktest.activity.SecondaryActivity;
 import com.onesignal.sdktest.adapter.InAppMessageRecyclerViewAdapter;
 import com.onesignal.sdktest.adapter.NotificationRecyclerViewAdapter;
 import com.onesignal.sdktest.adapter.PairRecyclerViewAdapter;
@@ -244,6 +247,10 @@ public ActivityViewModel onActivityCreated(Context context) {
         pauseInAppMessagesSwitch = getActivity().findViewById(R.id.main_activity_settings_pause_in_app_messages_switch);
         revokeConsentButton = getActivity().findViewById(R.id.main_activity_settings_revoke_consent_button);
 
+        Button navigateNextActivity = getActivity().findViewById(R.id.main_activity_navigate_button);
+        navigateNextActivity.setOnClickListener(v -> {
+            getActivity().startActivity(new Intent(getActivity(), SecondaryActivity.class));
+        });
         tagSet = new HashMap<>();
         tagArrayList = new ArrayList<>();
 

Examples/OneSignalDemo/app/src/main/res/layout/activity_secondary.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  tools:context=".activity.SecondaryActivity">
+
+</LinearLayout>

Examples/OneSignalDemo/app/src/main/res/layout/main_activity_layout.xml

@@ -1076,6 +1076,29 @@
 
             </LinearLayout>
 
+            <LinearLayout
+              android:layout_width="match_parent"
+              android:layout_height="56dp"
+              android:layout_gravity="center"
+              android:layout_marginStart="16dp"
+              android:layout_marginTop="4dp"
+              android:layout_marginEnd="16dp"
+              android:layout_marginBottom="16dp"
+              android:background="@color/colorPrimary"
+              android:gravity="center"
+              android:orientation="vertical">
+
+                <Button
+                  android:id="@+id/main_activity_navigate_button"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:text="@string/navigate_next_activity"
+                  android:textSize="19sp"
+                  android:textColor="@android:color/white"
+                  android:background="@drawable/ripple_selector_white_red"
+                  android:visibility="visible"/>
+
+            </LinearLayout>
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>

Examples/OneSignalDemo/app/src/main/res/values/strings.xml

@@ -52,6 +52,8 @@
     <string name="allow">Allow</string>
     <string name="revoke_consent">Revoke Consent</string>
 
+    <string name="navigate_next_activity">Next activity</string>
+
     <string name="onesignal_app_id">0ba9731b-33bd-43f4-8b59-61172e27447d</string>
 
 </resources>

OneSignalSDK/onesignal/src/main/java/com/onesignal/ActivityLifecycleHandler.java

@@ -107,7 +107,6 @@ void onActivityPaused(Activity activity) {
 
     void onActivityStopped(Activity activity) {
         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "onActivityStopped: " + activity);
-        focusHandler.startOnStopFocusWork();
 
         if (activity == curActivity) {
             curActivity = null;
@@ -119,6 +118,9 @@ void onActivityStopped(Activity activity) {
         }
 
         logCurActivity();
+
+        if (curActivity == null)
+            focusHandler.startOnStopFocusWork();
     }
 
     void onActivityDestroyed(Activity activity) {

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSFocusHandler.kt

@@ -42,21 +42,34 @@ class OSFocusHandler {
 
     fun startOnFocusWork() {
         resetBackgroundState()
+        OneSignal.onesignalLog(
+            OneSignal.LOG_LEVEL.DEBUG,
+            "OSFocusHandler running onAppFocus"
+        )
         OneSignal.onAppFocus()
     }
 
     fun startOnStartFocusWork() {
         if (stopped) {
             stopped = false
-            OSTimeoutHandler.getTimeoutHandler().destroyTimeout(stopRunnable)
             stopRunnable = null
+            OneSignal.onesignalLog(
+                OneSignal.LOG_LEVEL.DEBUG,
+                "OSFocusHandler running onAppStartFocusLogic"
+            )
             OneSignal.onAppStartFocusLogic()
+        } else {
+            resetStopState()
         }
     }
 
     fun startOnStopFocusWork() {
         stopRunnable = Runnable {
             stopped = true
+            OneSignal.onesignalLog(
+                OneSignal.LOG_LEVEL.DEBUG,
+                "OSFocusHandler setting stop state: true"
+            )
         }.also {
             OSTimeoutHandler.getTimeoutHandler().startTimeout(stopDelay, it)
         }
@@ -81,7 +94,15 @@ class OSFocusHandler {
         WorkManager.getInstance(context).cancelAllWorkByTag(tag)
     }
 
+    private fun resetStopState() {
+        stopped = false
+        stopRunnable?.let {
+            OSTimeoutHandler.getTimeoutHandler().destroyTimeout(it)
+        }
+    }
+
     private fun resetBackgroundState() {
+        resetStopState()
         backgrounded = false
     }