ensure there is no null URI

guardianproject · Dec 17, 2024 · 458dfeb · 458dfeb
1 parent 6298367
commit 458dfeb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 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
@@ -683,16 +683,27 @@ class CameraFragment : BaseFragment<FragmentCameraBinding>(R.layout.fragment_cam
                             allowMachineLearning
                         )
 
-                        proofUri = Uri.fromFile(fileOut)
+                        var proofUriC2pa = Uri.fromFile(fileOut)
 
+                        if (proofUriC2pa != null)
+                            proofUri = proofUriC2pa
 
                     }
 
-
                     val mw: MediaWatcher = MediaWatcher.getInstance(context)
-                    val resultProofHash: String = mw.processUri(proofUri, isDirectCapture, dateSaved)
 
-                    Timber.tag(CameraFragment.TAG).d("Photo proof generated: %s", resultProofHash)
+                    if (proofUri != null) {
+                        val resultProofHash: String? =
+                            mw.processUri(proofUri, isDirectCapture, dateSaved)
+
+                        Timber.tag(CameraFragment.TAG)
+                            .d("Photo proof generated: %s", resultProofHash)
+                    }
+                    else
+                    {
+                        Timber.tag(CameraFragment.TAG)
+                            .d("Photo URI was null")
+                    }
                 }
 
                 override fun onError(exception: ImageCaptureException) {

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
@@ -108,9 +108,11 @@ public void setStorageProvider (StorageProvider storageProvider)
     }
 
     public static synchronized MediaWatcher getInstance(Context context) {
-        if (mInstance == null)
+
+        if (mInstance == null) {
             mInstance = new MediaWatcher();
             mInstance.init(context, null);
+        }
 
         return mInstance;
     }