Fix gallery activity startup

eszdman · May 13, 2024 · a506235 · a506235
1 parent a9760d0
commit a506235
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -52,7 +52,7 @@ android {
         ndk {
             abiFilters "arm64-v8a"
         }
-        versionName '0.85'
+        versionName '0.87'
         proguardFiles
     }
 

diff --git a/app/src/main/java/com/particlesdevs/photoncamera/capture/CaptureController.java b/app/src/main/java/com/particlesdevs/photoncamera/capture/CaptureController.java
@@ -39,7 +39,6 @@
 import android.hardware.camera2.params.MeteringRectangle;
 import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.StreamConfigurationMap;
-import android.hardware.camera2.params.TonemapCurve;
 import android.media.CamcorderProfile;
 import android.media.ImageReader;
 import android.media.MediaRecorder;

diff --git a/app/src/main/java/com/particlesdevs/photoncamera/gallery/ui/GalleryActivity.java b/app/src/main/java/com/particlesdevs/photoncamera/gallery/ui/GalleryActivity.java
@@ -29,8 +29,15 @@ public class GalleryActivity extends BaseActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Object fragment = getIntent().getExtras().get("CameraFragment");
-        externalUsage = fragment == null;
+        Intent intent = getIntent();
+        Bundle extras = intent.getExtras();
+        if (extras != null) {
+            Object fragment = getIntent().getExtras().get("CameraFragment");
+            externalUsage = fragment == null;
+        } else {
+            externalUsage = true;
+        }
+
         getDelegate().setLocalNightMode(PreferenceKeys.getThemeValue());
         activityGalleryBinding = DataBindingUtil.setContentView(this, R.layout.activity_gallery);
         viewModel = new ViewModelProvider(this).get(GalleryViewModel.class);

diff --git a/app/version.properties b/app/version.properties
@@ -1,2 +1,2 @@
-#Mon May 13 22:07:22 MSK 2024
-VERSION_BUILD=16537
+#Tue May 14 01:10:21 MSK 2024
+VERSION_BUILD=16543