diff --git a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt index b68c785357..06d70403e7 100644 --- a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt +++ b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt @@ -76,6 +76,10 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks { if (HaloApp.isUserAcceptPrivacyPolicy(activity)) { DataUtils.onPause(activity) } + + if (activity.isFinishing) { + AppManager.getInstance().finishActivity(activity) + } } override fun onActivityStopped(activity: Activity) { @@ -87,9 +91,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks { } override fun onActivityDestroyed(activity: Activity) { - if (activity.isFinishing) { - AppManager.getInstance().finishActivity(activity) - } + // do nothing } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_and_feedback.xml b/app/src/main/res/layout/activity_help_and_feedback.xml index bf87cf5aab..38deea8cb7 100644 --- a/app/src/main/res/layout/activity_help_and_feedback.xml +++ b/app/src/main/res/layout/activity_help_and_feedback.xml @@ -15,7 +15,7 @@ diff --git a/app/src/main/res/layout/fragment_info_concern.xml b/app/src/main/res/layout/fragment_info_concern.xml index 0bd347735b..d47cbd682d 100644 --- a/app/src/main/res/layout/fragment_info_concern.xml +++ b/app/src/main/res/layout/fragment_info_concern.xml @@ -3,8 +3,13 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:background="@color/white"> + android:background="@color/white" + android:orientation="vertical"> + +