Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -32,18 +32,16 @@
     <application
         android:name=".MyApplication"
         android:allowBackup="true"
-        android:requestLegacyExternalStorage="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/logo"
         android:supportsRtl="true"
         android:theme="@style/Theme.ScanQR"
         tools:targetApi="31">
-        <activity
-            android:name=".ui.webview.WebBrowserActivity"
-            android:exported="false" />
+
         <activity
             android:name=".ui.start.StartActivity"
             android:exported="true"
@@ -224,6 +222,12 @@
             android:exported="false"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+        <activity
+            android:name=".ui.webview.WebBrowserActivity"
+            android:exported="false"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"

app/src/main/java/com/base/scanqrclear/fcm/notification/MyNotificationManager.kt

@@ -71,7 +71,7 @@ object MyNotificationManager {
         val next = actionIdList[0]
         actionIdList.removeAt(0)
         if (BuildConfig.DEBUG) {
-            return ACTION_ID_SCREEN_SHORT
+            return ACTION_ID_CONSTELLATION
         }
         return next
     }

app/src/main/java/com/base/scanqrclear/luma/CleanJunkActivity.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.animation.LinearInterpolator
+import androidx.activity.addCallback
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.base.scanqrclear.R
@@ -13,7 +14,6 @@ import com.base.scanqrclear.databinding.ActivityCleanJunkBinding
 import com.base.scanqrclear.luma.AdmobHelps.KEY_CLEANUP_SIZE
 import com.base.scanqrclear.luma.AdmobHelps.KEY_CLEAN_LAST_TIME
 import com.base.scanqrclear.luma.Utils.toDate
-import com.base.scanqrclear.utils.PermissionUtils.checkStorePermission
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
@@ -47,6 +47,9 @@ class CleanJunkActivity : BaseActivity2() {
         setContentView(binding.root)
         initView()
         showAdInterstitial(AdmobHelps.isShowAdInter()) { initData() }
+        onBackPressedDispatcher.addCallback {
+            handleBackPressed(this@CleanJunkActivity)
+        }
     }
 
     private fun initView() {

app/src/main/java/com/base/scanqrclear/luma/SimilarPhotosActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import androidx.activity.addCallback
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.base.scanqrclear.R
@@ -47,6 +48,9 @@ class SimilarPhotosActivity : BaseActivity2() {
         }, maxCompleted = { nativeAdLoader, nativeMaxAd ->
             binding.adNative.setNativeAd(nativeAdLoader, nativeMaxAd)
         })
+        onBackPressedDispatcher.addCallback {
+            handleBackPressed(this@SimilarPhotosActivity)
+        }
     }
 
     private fun initView() {

app/src/main/java/com/base/scanqrclear/service/StayJobService.kt

@@ -116,7 +116,7 @@ class StayJobService : JobService() {
         }
 
         override fun onFinish() {
-            LogEx.logDebug(TAG, "Timer onFinish")
+//            LogEx.logDebug(TAG, "Timer onFinish")
             notifyForeground()
             Timer().start()
         }

app/src/main/java/com/base/scanqrclear/ui/webview/WebBrowserActivity.kt

@@ -18,6 +18,8 @@ import android.webkit.WebStorage
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.lifecycle.lifecycleScope
+import com.base.scanqrclear.R
+import com.base.scanqrclear.ads.AdsMgr
 import com.base.scanqrclear.base.BaseActivity
 import com.base.scanqrclear.databinding.ActivityWebBrowserBinding
 import kotlinx.coroutines.delay
@@ -32,6 +34,7 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>(ActivityWebBr
         initWebSettings()
 
         binding.webView.loadUrl("https://www.horoscope.com/us/index.aspx")
+        AdsMgr.showNative(binding.flNative, R.layout.layout_ad_native_exit)
     }
 
     override fun initListener() {

app/src/main/res/layout/activity_web_browser.xml

@@ -36,8 +36,8 @@
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <FrameLayout
-        android:id="@+id/flBanner"
+    <com.base.scanqrclear.ads.NativeParentView
+        android:id="@+id/flNative"
         android:layout_width="match_parent"
-        android:layout_height="60dp" />
+        android:layout_height="wrap_content" />
 </LinearLayout>