improve generation of new activities and items to not have duplicates

guardianproject · Jan 11, 2024 · a924889 · a924889
1 parent 8f38e59
commit a924889
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/android-libproofcam/src/main/java/org/witness/proofmode/camera/fragments/CameraFragment.kt b/android-libproofcam/src/main/java/org/witness/proofmode/camera/fragments/CameraFragment.kt
@@ -755,9 +755,9 @@ class CameraFragment : BaseFragment<FragmentCameraBinding>(R.layout.fragment_cam
             }
         }
 
-        var intent = Intent(NEW_MEDIA_EVENT)
-        intent.data = newMediaFile
-        activity?.applicationContext?.let { LocalBroadcastManager.getInstance(it).sendBroadcast(intent) }
+       // var intent = Intent(NEW_MEDIA_EVENT)
+       // intent.data = newMediaFile
+       // activity?.applicationContext?.let { LocalBroadcastManager.getInstance(it).sendBroadcast(intent) }
 
     }
 

diff --git a/app/src/main/java/org/witness/proofmode/Activities.kt b/app/src/main/java/org/witness/proofmode/Activities.kt
@@ -224,7 +224,16 @@ object Activities: ViewModel()
         val lastActivity = this.activities.lastOrNull()
         if (activity.type is ActivityType.MediaCaptured && lastActivity != null && lastActivity.type is ActivityType.MediaCaptured && (lastActivity.startTime.time + timeBatchWindow) >= activity.startTime.time) {
             // If within the same minute, add it to the same "batch" as the previous one.
-            lastActivity.type.items += activity.type.items
+
+            for (pItem in activity.type.items)
+            {
+                if (!lastActivity.type.items.any{ it.uri == pItem.uri})                 
+                {
+                    lastActivity.type.items.add(pItem)
+                }
+            }
+
+           // lastActivity.type.items += activity.type.items
             viewModelScope.launch {
                 if (db.activitiesDao().activityFromProofableItemId(activity.id) == null)
                     db.activitiesDao().update(lastActivity)

diff --git a/app/src/main/java/org/witness/proofmode/ProofEventReceiver.kt b/app/src/main/java/org/witness/proofmode/ProofEventReceiver.kt
@@ -12,12 +12,14 @@ import java.util.UUID
 class ProofEventReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
 
+        /**
         //got event
         Toast.makeText(
             context,
             R.string.progress_generating_proof,
             Toast.LENGTH_SHORT
         ).show()
+            **/
 
         var uriMedia = intent?.getStringExtra(ProofMode.EVENT_PROOF_EXTRA_URI)?.let {