merge

app/src/main/java/com/base/datarecovery/fcm/NotificationUtil.kt

@@ -26,6 +26,7 @@ import com.base.datarecovery.utils.AppPreferences
 import com.base.datarecovery.utils.CleanJunkStringResourceManager
 import com.base.datarecovery.utils.DocumentRecoveryStringManager
 import com.base.datarecovery.utils.DuplicatePhotoStringResourceManager
+import com.base.datarecovery.utils.EventUtils
 import com.base.datarecovery.utils.PhotoRecoveryStringManager
 import com.base.datarecovery.utils.PrivacySpaceStringManager
 import com.base.datarecovery.utils.ScreenshotCleanupStringManager
@@ -193,14 +194,14 @@ object NotificationUtil {
     private var handler: Handler? = null
 
     fun sendNotification(context: Context) {
-        val actionId: Int =getNextNotificationId()
-//        KParameter.Kind.INSTANCE.event("showNotification", null, null, false)
+        val actionId: Int = getNextNotificationId()
+        EventUtils.event("showNotification", null, null, false)
 
         if (MyApplication.PAUSED_VALUE == 1) {
             return
         }
 
-        val interval: Int = AppPreferences.getInstance().getString("notificationInterval", "60").toIntOrNull()?:60
+        val interval: Int = AppPreferences.getInstance().getString("notificationInterval", "60").toIntOrNull() ?: 60
         val lastTime: Long = AppPreferences.getInstance().getLong("last_notification_time", 0)
         val nowTime = System.currentTimeMillis()
         val x = nowTime - lastTime
@@ -208,13 +209,13 @@ object NotificationUtil {
             return
         }
 
-       sendNotification(context, actionId)
+        sendNotification(context, actionId)
 
-        val open: Int = AppPreferences.getInstance().getString("open", "0").toIntOrNull()?:0
+        val open: Int = AppPreferences.getInstance().getString("open", "0").toIntOrNull() ?: 0
 
         if (open == 1) {
-            val num: Int = AppPreferences.getInstance().getString("num", "0").toIntOrNull()?:0
-            val delay: Long = AppPreferences.getInstance().getString("delay", "0").toLongOrNull()?:0L
+            val num: Int = AppPreferences.getInstance().getString("num", "0").toIntOrNull() ?: 0
+            val delay: Long = AppPreferences.getInstance().getString("delay", "0").toLongOrNull() ?: 0L
             handlerThread = HandlerThread("NotificationHandlerThread")
             handlerThread!!.start()
 
@@ -228,7 +229,7 @@ object NotificationUtil {
                         return@Runnable
                     }
                     if (MyApplication.PAUSED_VALUE !== 1) {
-                       sendNotification(context, actionId)
+                        sendNotification(context, actionId)
                     }
                 }, time)
             }
@@ -242,10 +243,10 @@ object NotificationUtil {
             handler?.removeCallbacksAndMessages(null)
         }
         if (handlerThread != null) {
-           handlerThread?.quit()
+            handlerThread?.quit()
             handlerThread = null
         }
-       handler = null
+        handler = null
     }
 
     private var currentNotificationIdIndex = -1

app/src/main/java/com/base/datarecovery/utils/EventUtils.kt

@@ -22,12 +22,12 @@ object EventUtils {
         }
 
 
-//        if (isSingleEvent) {
-//            val stringSet = AppPreferences.getInstance().getString("singleEvent")
-//            if (stringSet.contains(key)) {
-//                return
-//            }
-//        }
+        if (isSingleEvent) {
+            val stringSet = AppPreferences.getInstance().getStringSet("singleEvent", setOf())
+            if (stringSet.contains(key)) {
+                return
+            }
+        }
 
         Thread {
             var parmJson: String? = ""