Merge branch 'master' of gitlab.huolea.com:koko/file-recovery-recyclebin

app/src/main/java/com/base/filerecoveryrecyclebin/activity/recyclebin/RecycleBinDetailActivity.kt

@@ -10,6 +10,7 @@ import androidx.activity.addCallback
 import androidx.annotation.RequiresApi
 import androidx.core.view.updatePadding
 import com.base.filerecoveryrecyclebin.activity.ResultActivity
+import com.base.filerecoveryrecyclebin.activity.recovery.FileRecoveredActivity
 import com.base.filerecoveryrecyclebin.activity.recyclebin.RecycleBinFileEx.findRecycleBinFile
 import com.base.filerecoveryrecyclebin.activity.recyclebin.RecycleBinFileEx.findRecycleBinJsonFile
 import com.base.filerecoveryrecyclebin.bean.ConstObject.RECYCLE_BIN
@@ -88,8 +89,7 @@ class RecycleBinDetailActivity : BaseActivity<ActivityRecycleBinDetailBinding>()
                     recoveryFile(bean.name)
                 }
             }
-            startActivity(Intent(this, ResultActivity::class.java).apply {
-                putExtra("from", RECYCLE_BIN)
+            startActivity(Intent(this, FileRecoveredActivity::class.java).apply {
             })
             finish()
         }

app/src/main/java/com/base/filerecoveryrecyclebin/ads/max/AdMaxInit.kt

@@ -17,8 +17,8 @@ object AdMaxInit {
 
     fun Context.initAdMax() {
         // If you want to test your own AppLovin SDK key, change the value here and update the package name in the build.gradle
-//        val YOUR_SDK_KEY = "05TMDQ5tZabpXQ45_UTbmEGNUtVAzSTzT6KmWQc5_CuWdzccS4DCITZoL3yIWUG3bbq60QC_d4WF28tUC4gVTF"
-        val YOUR_SDK_KEY="GGPreND6SRmCt1zJgn5faiLGD8c2PVGPLgPpSg7cHanVTud1DhtuI9MmteTqlEviaJ57WnxW68kQDaATJ5z3cW"
+        val YOUR_SDK_KEY = "05TMDQ5tZabpXQ45_UTbmEGNUtVAzSTzT6KmWQc5_CuWdzccS4DCITZoL3yIWUG3bbq60QC_d4WF28tUC4gVTF"
+//        val YOUR_SDK_KEY="GGPreND6SRmCt1zJgn5faiLGD8c2PVGPLgPpSg7cHanVTud1DhtuI9MmteTqlEviaJ57WnxW68kQDaATJ5z3cW"
 
         val executor = Executors.newSingleThreadExecutor();
         executor.execute {

app/src/main/java/com/base/filerecoveryrecyclebin/help/ConfigHelper.kt

@@ -5,7 +5,7 @@ import com.base.filerecoveryrecyclebin.activity.SplashActivity
 object ConfigHelper {
 
 
-    const val privacyPolicy = "https://sites.google.com/view/file-recovery-po/file-recovery"
+    const val privacyPolicy = "https://sites.google.com/view/dumpsterphoto-recovery/home"
 
     // 域名
     const val eventUrl = "https://rp.rocioxyn.xyz"
@@ -14,21 +14,21 @@ object ConfigHelper {
     const val admobTrueMaxFlase = false
 
     // admob广告id
-    const val interAdmobId = "ca-app-pub-3940256099942544/1033173712"
-    const val nativeAdmobId = "ca-app-pub-3940256099942544/2247696110"
+    const val interAdmobId = "ca-app-pub-3940256099942544/1033173111"
+    const val nativeAdmobId = "ca-app-pub-3940256099942544/2247696111"
     const val openAdmobId = "/6499/example/app-open"
-    const val bannerAdmobId = "ca-app-pub-3940256099942544/9214589741"
+    const val bannerAdmobId = "ca-app-pub-3940256099942544/9214589111"
 
-    const val interAdMaxId = "b31e7f6d11ee659e"
-    const val nativeAdMaxId = "96e8fe78b0efc5d1"
-    const val openAdMaxId = "d1d943cdd3127c90"
+    const val interAdMaxId = "a"
+    const val nativeAdMaxId = "b"
+    const val openAdMaxId = "c"
     const val bannerMaxId = "ca-app-pub-3940256099942544/9214589741"
 
     //一定展示大图广告
     var mustShowNativeAd: Boolean = false
 
     // 正式包名
-    const val packageName = "com.kuke.photosrecovery.allrecovery.acbcali"
+    const val packageName = "com.baloota.photorecyclebin.awm.sp"
 
     val noLoadingActivities = listOf(
         "full", // 过滤全屏广告

app/src/main/java/com/base/filerecoveryrecyclebin/service/BackUpUtils.kt

@@ -11,6 +11,7 @@ import com.base.filerecoveryrecyclebin.activity.recyclebin.RecycleBinFileEx.getR
 import com.base.filerecoveryrecyclebin.bean.RecycleBinBean
 import com.base.filerecoveryrecyclebin.help.BaseApplication
 import com.base.filerecoveryrecyclebin.utils.AppPreferences
+import com.base.filerecoveryrecyclebin.utils.LogEx
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import java.io.File
@@ -20,6 +21,7 @@ import java.util.stream.Collectors
 
 object BackUpUtils {
 
+    private val TAG = "BackUpUtils"
     private const val KEY = "backup_key"
 
 
@@ -29,7 +31,12 @@ object BackUpUtils {
         }
         try {
             val recycleBinFile = File(getRecycleBinDir(), ".$path")
-            src.copyTo(recycleBinFile, true)
+            LogEx.logDebug(TAG, "oo=$src ${src.length()}")
+            if (src.length() == 0L) {
+                return
+            }
+            val ss = src.copyTo(recycleBinFile, true)
+            LogEx.logDebug(TAG, "ss=$ss")
             val binBean = RecycleBinBean(
                 path,
                 src.path,

app/src/main/java/com/base/filerecoveryrecyclebin/utils/AESHelper.kt

@@ -8,7 +8,7 @@ import javax.crypto.spec.SecretKeySpec
 
 object AESHelper {
 
-    private const val aesKey = "szw6wn7ehtwm6ip5"
+    private const val aesKey = "muftvwnzvbxln1zk"
 
     private val cipher by lazy {
         Cipher.getInstance("AES/GCM/NoPadding")

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

 <resources>
-    <string name="app_name">Dumpster:Photo / File Recovery</string>
+    <string name="app_name">Dumpster:Photo Recovery</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="facebook_app_id">1141667540450666</string>
+    <string name="facebook_app_id">7796777470443584</string>
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>
     <string name="second_fragment_label">Second Fragment</string>