nullable check

SlinkyLab · Oct 10, 2022 · e5bc3d8 · e5bc3d8
1 parent 4c44f3b
commit e5bc3d8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java b/matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java
@@ -170,8 +170,12 @@ protected void onSaveInstanceState(@NonNull Bundle outState) {
         mSelectedCollection.onSaveInstanceState(outState);
         mAlbumCollection.onSaveInstanceState(outState);
         outState.putBoolean("checkState", mOriginalEnable);
-        outState.putString("path", mMediaStoreCompat.getCurrentPhotoPath());
-        outState.putString("uri", mMediaStoreCompat.getCurrentPhotoUri().toString());
+        Uri currentPhotoUri = mMediaStoreCompat.getCurrentPhotoUri();
+        String currentPhotoPath = mMediaStoreCompat.getCurrentPhotoPath();
+        if (currentPhotoUri != null && currentPhotoPath != null) {
+            outState.putString("path", currentPhotoPath);
+            outState.putString("uri", currentPhotoUri.toString());
+        }
     }
 
     @Override