fixes for photos and video capture to fix duplicate display and other…

… improvements
guardianproject · Oct 18, 2024 · 1edd248 · 1edd248
1 parent 578b6c2
commit 1edd248
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 37 deletions.
diff --git a/android-libproofcam/build.gradle.kts b/android-libproofcam/build.gradle.kts
@@ -40,8 +40,8 @@ dependencies {
     implementation(project(":android-libproofmode"))
 
     //new C2PA content authenticity support
-    api ("info.guardianproject:simple_c2pa:0.0.14")
-    implementation ("net.java.dev.jna:jna:5.13.0@aar")
+    //api ("info.guardianproject:simple_c2pa:0.0.14")
+   // implementation ("net.java.dev.jna:jna:5.13.0@aar")
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
 

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
@@ -38,9 +38,9 @@ import coil.transform.CircleCropTransformation
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.witness.proofmode.c2pa.C2paUtils
 import org.witness.proofmode.camera.CameraActivity
 import org.witness.proofmode.camera.R
-import org.witness.proofmode.camera.c2pa.C2paUtils
 import org.witness.proofmode.camera.databinding.FragmentCameraBinding
 import org.witness.proofmode.camera.enums.CameraTimer
 import org.witness.proofmode.camera.utils.*

diff --git a/android-libproofcam/src/main/java/org/witness/proofmode/camera/fragments/VideoFragment.kt b/android-libproofcam/src/main/java/org/witness/proofmode/camera/fragments/VideoFragment.kt
@@ -38,9 +38,9 @@ import coil.request.ImageRequest
 import coil.transform.CircleCropTransformation
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.witness.proofmode.c2pa.C2paUtils
 import org.witness.proofmode.camera.CameraActivity
 import org.witness.proofmode.camera.R
-import org.witness.proofmode.camera.c2pa.C2paUtils
 import org.witness.proofmode.camera.databinding.FragmentVideoBinding
 import org.witness.proofmode.camera.fragments.VideoFragment.CameraConstants.NEW_MEDIA_EVENT
 import org.witness.proofmode.camera.utils.*
@@ -385,7 +385,7 @@ class VideoFragment : BaseFragment<FragmentVideoBinding>(R.layout.fragment_video
                                 allowMachineLearning
                             )
 
-                          //  proofUri = Uri.fromFile(fileOut)
+                           // proofUri = Uri.fromFile(fileOut)
 
                         }
 

diff --git a/android-libproofmode/build.gradle b/android-libproofmode/build.gradle
@@ -69,10 +69,9 @@ dependencies {
     // Required -- JUnit 4 framework
     androidTestImplementation 'junit:junit:4.13.2'
 
-
     //new C2PA content authenticity support
     api ("info.guardianproject:simple_c2pa:0.0.14")
-    implementation ("net.java.dev.jna:jna:5.13.0@aar")
+    api ("net.java.dev.jna:jna:5.13.0@aar")
 
 
     // Testing-only dependencies

diff --git a/...itness/proofmode/camera/c2pa/C2paUtils.kt → ...a/org/witness/proofmode/c2pa/C2paUtils.kt b/...itness/proofmode/camera/c2pa/C2paUtils.kt → ...a/org/witness/proofmode/c2pa/C2paUtils.kt
@@ -1,4 +1,4 @@
-package org.witness.proofmode.camera.c2pa
+package org.witness.proofmode.c2pa
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -290,7 +290,10 @@ class C2paUtils {
             var exifData = ExifData(exifGpsVersion, exifLat, exifLong, null, exifAlt, exifTimestamp, null, null, null, null, null, null, null, null, null, null, null, exifMake, exifModel, null, null, null)
             contentCreds?.addExifAssertion(exifData)
 
-            contentCreds?.embedManifest(fileImageOut.absolutePath)
+            if (isDirectCapture)
+                contentCreds?.embedManifest(fileImageOut.absolutePath)
+            else
+                contentCreds?.exportManifest(fileImageOut.absolutePath)
 
         }
 

diff --git a/...ess/proofmode/camera/c2pa/GPSTracker.java → ...rg/witness/proofmode/c2pa/GPSTracker.java b/...ess/proofmode/camera/c2pa/GPSTracker.java → ...rg/witness/proofmode/c2pa/GPSTracker.java
@@ -1,4 +1,4 @@
-package org.witness.proofmode.camera.c2pa;
+package org.witness.proofmode.c2pa;
 
 
 import android.Manifest;

diff --git a/android-libproofmode/src/main/java/org/witness/proofmode/service/MediaWatcher.java b/android-libproofmode/src/main/java/org/witness/proofmode/service/MediaWatcher.java
@@ -223,7 +223,7 @@ public void queueMedia(Uri uriMedia, boolean autogen, Date createdAt) {
         });
     }
 
-    public synchronized String processUri (Uri uriMedia, boolean autogen, Date createdAt) {
+    public String processUri (Uri uriMedia, boolean autogen, Date createdAt) {
 
         Intent intent = new Intent();
         intent.setPackage("org.witness.proofmode");
@@ -304,7 +304,7 @@ public String processUri(Uri fileUri, String proofHash, boolean autogenerated, D
         }
     }
 
-    public synchronized String processUri(final Context context, final Uri uriMedia, String mediaHash, boolean autogenerated, Date createdAt) throws IOException, PGPException {
+    public String processUri(final Context context, final Uri uriMedia, String mediaHash, boolean autogenerated, Date createdAt) throws IOException, PGPException {
 
         if (mPrefs == null)
             mPrefs = PreferenceManager.getDefaultSharedPreferences(context);

diff --git a/android-libproofmode/src/main/java/org/witness/proofmode/service/PhotosContentJob.java b/android-libproofmode/src/main/java/org/witness/proofmode/service/PhotosContentJob.java
@@ -17,16 +17,19 @@
 import android.provider.MediaStore;
 import android.text.TextUtils;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import timber.log.Timber;
 
+import org.witness.proofmode.c2pa.C2paUtils;
 /**
  * Job to monitor when there is a change to photos in the media provider.
  */
@@ -96,8 +99,9 @@ private void doWork ()
 
                             String mediaPath = MediaWatcher.getMediaPath(PhotosContentJob.this, uri);
 
+                            //if we can get to the direct file path, we should!
                             if (mediaPath != null)
-                                uriList.put(mediaPath, uri);
+                                uriList.put(mediaPath, Uri.fromFile(new File(mediaPath)));
                             else
                                 uriList.put(uri.toString(), uri);
                         }
@@ -109,6 +113,10 @@ private void doWork ()
 
                             executor.execute(() -> {
                                 try {
+
+                                    if (Objects.equals(uriProcess.getScheme(), "file"))
+                                        C2paUtils.Companion.addContentCredentials(PhotosContentJob.this, uriProcess, true, true);
+
                                     MediaWatcher mw = MediaWatcher.getInstance(PhotosContentJob.this);
                                     String resultProofHash = mw.processUri(uriProcess, true, null);
                                     Timber.d("generated hash via job: " + resultProofHash);
@@ -158,9 +166,9 @@ public static void scheduleJob(Context context) {
                 new JobInfo.TriggerContentUri(MediaStore.Images.Media.INTERNAL_CONTENT_URI,
                         JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
 
-        builder.addTriggerContentUri(
-                new JobInfo.TriggerContentUri(Uri.parse("content://media/external_primary"),
-                        JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
+      //  builder.addTriggerContentUri(
+        //        new JobInfo.TriggerContentUri(Uri.parse("content://media/external_primary"),
+          //              JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
 
         // Get all media changes within a tenth of a second.
         builder.setTriggerContentUpdateDelay(1000);

diff --git a/android-libproofmode/src/main/java/org/witness/proofmode/service/VideosContentJob.java b/android-libproofmode/src/main/java/org/witness/proofmode/service/VideosContentJob.java
@@ -46,9 +46,11 @@ public static void scheduleJob(Context context) {
         JobInfo.Builder builder = new JobInfo.Builder(
                 VIDEO_JOB_ID,
                 new ComponentName(context, VideosContentJob.class));
+
         builder.addTriggerContentUri(
                 new JobInfo.TriggerContentUri(MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
                         JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
+
         builder.addTriggerContentUri(
                 new JobInfo.TriggerContentUri(MediaStore.Video.Media.INTERNAL_CONTENT_URI,
                         JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));

diff --git a/app/src/main/java/org/witness/proofmode/Activities.kt b/app/src/main/java/org/witness/proofmode/Activities.kt
@@ -299,6 +299,7 @@ object Activities: ViewModel()
     }
 
     fun getProofableItem(context: Context, selectId: String): List<ProofableItem> {
+        getDB(context)
 
         var listItems = ArrayList<ProofableItem>()
 

diff --git a/app/src/main/java/org/witness/proofmode/MainActivity.kt b/app/src/main/java/org/witness/proofmode/MainActivity.kt
@@ -42,7 +42,6 @@ import org.witness.proofmode.ProofMode.PREF_OPTION_CREDENTIALS_DEFAULT
 import org.witness.proofmode.ProofModeConstants.PREFS_KEY_PASSPHRASE
 import org.witness.proofmode.ProofModeConstants.PREFS_KEY_PASSPHRASE_DEFAULT
 import org.witness.proofmode.camera.CameraActivity
-import org.witness.proofmode.camera.c2pa.C2paUtils
 import org.witness.proofmode.crypto.pgp.PgpUtils
 import org.witness.proofmode.databinding.ActivityMainBinding
 import org.witness.proofmode.onboarding.OnboardingActivity

diff --git a/app/src/main/java/org/witness/proofmode/ProofEventReceiver.kt b/app/src/main/java/org/witness/proofmode/ProofEventReceiver.kt
@@ -4,12 +4,9 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.util.Log
-import android.widget.Toast
 import androidx.compose.runtime.mutableStateListOf
 import timber.log.Timber
 import java.util.Date
-import java.util.UUID
 
 class ProofEventReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
@@ -23,21 +20,28 @@ class ProofEventReceiver : BroadcastReceiver() {
         ).show()
             **/
 
-        var uriMedia = intent?.getStringExtra(ProofMode.EVENT_PROOF_EXTRA_URI)?.let {
-
-            if (context != null) {
-                Activities.addActivity(
-                    Activity(
-                        it, ActivityType.MediaCaptured(
-                            items = mutableStateListOf(
-                                ProofableItem(it, Uri.parse(it))
-                            )
-                        ), Date()
-                    ), context
-                )
+        val uriMedia = intent?.getStringExtra(ProofMode.EVENT_PROOF_EXTRA_URI)
+        val proofHash = intent?.getStringExtra(ProofMode.EVENT_PROOF_EXTRA_HASH)
+
+        uriMedia?.let {
+
+            if (context != null && proofHash != null) {
+
+                if (Activities.getProofableItem(context, proofHash).isEmpty()) {
+
+                    Activities.addActivity(
+                        Activity(
+                            it, ActivityType.MediaCaptured(
+                                items = mutableStateListOf(
+                                    ProofableItem(proofHash, Uri.parse(it))
+                                )
+                            ), Date()
+                        ), context
+                    )
+                }
             }
 
-            Timber.tag("ProofEventReceiver").i("New Proof Event: " + it)
+            Timber.tag("ProofEventReceiver").i("New Proof Event: %s", it)
         }
     }
 

diff --git a/app/src/main/java/org/witness/proofmode/ProofModeApp.kt b/app/src/main/java/org/witness/proofmode/ProofModeApp.kt
@@ -29,7 +29,7 @@ import org.bouncycastle.openpgp.PGPException
 import org.bouncycastle.openpgp.PGPUtil
 import org.witness.proofmode.ProofModeConstants.PREFS_KEY_PASSPHRASE
 import org.witness.proofmode.ProofModeConstants.PREFS_KEY_PASSPHRASE_DEFAULT
-import org.witness.proofmode.camera.c2pa.C2paUtils
+import org.witness.proofmode.c2pa.C2paUtils
 import org.witness.proofmode.crypto.pgp.PgpUtils
 import org.witness.proofmode.notaries.GoogleSafetyNetNotarizationProvider
 import org.witness.proofmode.notaries.OpenTimestampsNotarizationProvider

diff --git a/app/src/main/java/org/witness/proofmode/SettingsActivity.kt b/app/src/main/java/org/witness/proofmode/SettingsActivity.kt
@@ -17,7 +17,7 @@ import org.witness.proofmode.PermissionActivity
 import org.witness.proofmode.PermissionActivity.Companion.hasPermissions
 import org.witness.proofmode.ProofMode.PREF_CREDENTIALS_PRIMARY
 import org.witness.proofmode.ProofMode.PREF_OPTION_AI_DEFAULT
-import org.witness.proofmode.camera.c2pa.C2paUtils
+import org.witness.proofmode.c2pa.C2paUtils
 import org.witness.proofmode.crypto.pgp.PgpUtils
 import org.witness.proofmode.databinding.ActivitySettingsBinding
 import org.witness.proofmode.util.GPSTracker

diff --git a/app/src/main/java/org/witness/proofmode/ShareProofActivity.kt b/app/src/main/java/org/witness/proofmode/ShareProofActivity.kt
@@ -45,8 +45,8 @@ import org.witness.proofmode.ProofMode.PREF_OPTION_AI
 import org.witness.proofmode.ProofMode.PREF_OPTION_AI_DEFAULT
 import org.witness.proofmode.ProofModeConstants.PREFS_KEY_PASSPHRASE
 import org.witness.proofmode.ProofModeConstants.PREFS_KEY_PASSPHRASE_DEFAULT
-import org.witness.proofmode.camera.c2pa.C2paUtils
-import org.witness.proofmode.camera.c2pa.C2paUtils.Companion.C2PA_CERT_PATH
+import org.witness.proofmode.c2pa.C2paUtils
+import org.witness.proofmode.c2pa.C2paUtils.Companion.C2PA_CERT_PATH
 import org.witness.proofmode.crypto.HashUtils
 import org.witness.proofmode.crypto.pgp.PgpUtils
 import org.witness.proofmode.databinding.ActivityShareBinding
-Original file line number
+Diff line change
@@ Expand Up / @@ -299,6 +299,7 @@ object Activities: ViewModel() @@
         }
         fun getProofableItem(context: Context, selectId: String): List<ProofableItem> {
+            getDB(context)
             var listItems = ArrayList<ProofableItem>()
@@ Expand Down @@