Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 893bbb2a authored by Mark Harman's avatar Mark Harman
Browse files

Fix suffixes to the new _X format instead of _EXPX for expo photo mode too.

parent bccbef04
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ Version 1.42.1 (Work in progress)

FIXED   Possible fix for boot loop on LineageOS (this is a LineageOS bug exposed by using Android
        Studio 3; workaround is to upgrade to build tools 27.0.1).
FIXED   Change in 1.42 for using suffix "_0" etc instead of "_EXP0" etc was only done for HDR expo
        images; now done for Expo {} photo mode too.
UPDATED Now targetting Android 8.

Version 1.42 (2017/11/19)
+4 −2
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ public class ImageSaver extends Thread {
        	long time_s = System.currentTimeMillis();
			if( request.jpeg_images.size() > 1 ) {
				// if there's only 1 image, we're in DRO mode, and shouldn't save the base image
				// note that in earlier Open Camera versions, we used _EXP as the suffix. We now use just "_" from 1.42 onwards, so Google
				// note that in earlier Open Camera versions, we used "_EXP" as the suffix. We now use just "_" from 1.42 onwards, so Google
				// Photos will group them together. (Unfortunately using "_EXP_" doesn't work, the images aren't grouped!)
				saveBaseImages(request, "_");
				if( MyDebug.LOG ) {
@@ -866,7 +866,9 @@ public class ImageSaver extends Thread {
				for(int i=0;i<request.jpeg_images.size();i++) {
					// note, even if one image fails, we still try saving the other images - might as well give the user as many images as we can...
					byte [] image = request.jpeg_images.get(i);
					String filename_suffix = "_EXP" + i;
					// see note above how we used to use "_EXP" for the suffix
					//String filename_suffix = "_EXP" + i;
					String filename_suffix = "_" + i;
					boolean share_image = i == mid_image;
					if( !saveSingleImageNow(request, image, null, filename_suffix, true, share_image) ) {
						if( MyDebug.LOG )