Fix #194: Update to latest libs containing the fix for 2 initial intents

android/backup/src/main/java/net/twisterrob/inventory/android/fragment/BackupControllerFragment.java

@@ -17,13 +17,13 @@
 import androidx.annotation.Nullable;
 import dagger.hilt.android.AndroidEntryPoint;
 
+import net.twisterrob.android.contracts.CreateOpenableDocument;
+import net.twisterrob.android.contracts.OpenOpenableDocument;
 import net.twisterrob.android.utils.tools.DialogTools;
 import net.twisterrob.inventory.android.Constants;
 import net.twisterrob.inventory.android.backup.R;
 import net.twisterrob.inventory.android.backup.concurrent.BackupService;
-import net.twisterrob.inventory.android.content.CreateOpenableDocument;
 import net.twisterrob.inventory.android.content.InventoryContract;
-import net.twisterrob.inventory.android.content.OpenOpenableDocument;
 
 @AndroidEntryPoint
 public class BackupControllerFragment extends BaseFragment<BackupControllerFragment.BackupEvents> {

android/base/src/main/java/net/twisterrob/inventory/android/utils/PictureHelper.java

@@ -1,46 +1,19 @@
 package net.twisterrob.inventory.android.utils;
 
-import java.io.File;
-import java.util.regex.Pattern;
+import android.graphics.Color;
+import android.graphics.ColorMatrix;
 
-import org.slf4j.*;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.*;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.MediaStore;
-
-import static android.graphics.Color.*;
-
-import androidx.annotation.*;
-
-import net.twisterrob.android.content.ImageRequest;
-import net.twisterrob.android.utils.tools.*;
+import androidx.annotation.ColorInt;
+import androidx.annotation.FloatRange;
+import androidx.annotation.NonNull;
 
 public abstract class PictureHelper {
-	private static final Logger LOG = LoggerFactory.getLogger(PictureHelper.class);
-
-	private static final String CROPPED_SUFFIX = "_crop";
-	private static final String EXTENSION_SEPARATOR = ".";
-	private static final String EXTRACT_PARTS = "(.*)" + Pattern.quote(EXTENSION_SEPARATOR) + "(.*)";
 	private static final float[] NEGATIVE = new float[] {
 			-1, 0, 0, 0, 255,
 			0, -1, 0, 0, 255,
 			0, 0, -1, 0, 255,
 			0, 0, 0, 1, 0
 	};
-	private @Nullable Bitmap thumb;
-	private Bitmap image;
-	private File file;
-	private File cropFile;
-	private final Activity activity;
-
-	public PictureHelper(Activity activity) {
-		this.activity = activity;
-	}
 
 	/**
 	 * Given a transparent greyscale image this tints the blacks/greys with the given color, leaves white intact.
@@ -55,10 +28,10 @@ public PictureHelper(Activity activity) {
 		ColorMatrix matrix = new ColorMatrix();
 		matrix.postConcat(new ColorMatrix(NEGATIVE));
 		matrix.postConcat(new ColorMatrix(new float[] {
-				1 - red(color) / 255f, 0, 0, 0, 0,
-				0, 1 - green(color) / 255f, 0, 0, 0,
-				0, 0, 1 - blue(color) / 255f, 0, 0,
-				0, 0, 0, alpha(color) / 255f, 0
+				1 - Color.red(color) / 255f, 0, 0, 0, 0,
+				0, 1 - Color.green(color) / 255f, 0, 0, 0,
+				0, 0, 1 - Color.blue(color) / 255f, 0, 0,
+				0, 0, 0, Color.alpha(color) / 255f, 0
 		}));
 		matrix.postConcat(new ColorMatrix(NEGATIVE));
 		return matrix;
@@ -79,108 +52,18 @@ public PictureHelper(Activity activity) {
 	 * @see <a href="http://stackoverflow.com/a/31217267/253468">SO</a>
 	 * @see <a href="https://gist.github.com/ro-sharp/49fd46a071a267d9e5dd">Gist</a>
 	 */
-	@SuppressWarnings("UnusedAssignment")
-	public static int getColor(Object thing) {
+	public static @ColorInt int getColor(@NonNull Object thing) {
 		int seed = thing.hashCode();
 		// Math.sin jumps big enough even when adding 1, because argument is radian and period is ~3
-		int rand_r = (int)Math.abs(Math.sin(seed++) * 10000) & 0xFF;
-		int rand_g = (int)Math.abs(Math.sin(seed++) * 10000) & 0xFF;
-		int rand_b = (int)Math.abs(Math.sin(seed++) * 10000) & 0xFF;
-
-		int r = Math.round((160 + rand_r) / 2);
-		int g = Math.round((160 + rand_g) / 2);
-		int b = Math.round((160 + rand_b) / 2);
-		return argb(0xFF, r, g, b);
-	}
-
-	protected abstract File getTargetFile();
-
-	protected File getTargetFileCropped() {
-		File file = getTargetFile();
-		String name = file.getName().replaceFirst(EXTRACT_PARTS, "$1");
-		String ext = file.getName().replaceFirst(EXTRACT_PARTS, "$2");
-		return new File(file.getParentFile(), name + CROPPED_SUFFIX + EXTENSION_SEPARATOR + ext);
-	}
-
-	public Intent startCapture() {
-		file = getTargetFile();
-		return new ImageRequest.Builder(activity).addCameraIntents(file).build().getIntent();
-	}
-
-	/**
-	 * Back from chooser: code = 0, data = null
-	 * Camera take picture (file, uri): code = -1, data = null, uri= file:///storage/emulated/0/Android/data/net.twisterrob.inventory/files/Pictures/Item_5_20140717_173719.jpg
-	 * Gallery pick picture: code = -1, data = (action=null, data=content://media/external/images/media/1173, extras)
-	 * mimeType=image/*
-	 * selectedCount=1
-	 * selectedItems=content://media/external/images/media/1173
-	 * Total commander: data=content://com.ghisler.android.TotalCommander.files/storage/emulated/0/DCIM/Facebook/IMG_85501072011957.jpeg
-	 * @return <code>true</code> if capture was successful
-	 */
-	public boolean endCapture(int resultCode, Intent intent) {
-		LOG.trace("endCapture(resultCode={}, intent={}): {}\nextras={}", resultCode, intent, file,
-				intent != null? StringerTools.toShortString(intent.getExtras()) : null);
-		if (resultCode == Activity.RESULT_CANCELED) {
-			file = null;
-			return false;
-		}
-		file = processReceivedIntent(intent);
-		return true;
-	}
-
-	public File getFile() {
-		return cropFile != null? cropFile : file;
-	}
-
-	public Bitmap getBitmap() {
-		return image;
-	}
-
-	public Bitmap getThumbnail() {
-		return thumb;
-	}
-
-	public Intent startCrop() {
-		cropFile = getTargetFileCropped();
-		Intent intent = null;
-		if (file != null && cropFile != null) {
-			intent = new Intent("com.android.camera.action.CROP");
-			intent.setDataAndType(Uri.fromFile(file), "image/*");
-			intent.putExtra("crop", "true");
-			intent.putExtra("scale", "true");
-			intent.putExtra("scaleUpIfNeeded", true);
-			intent.putExtra("aspectX", 1);
-			intent.putExtra("aspectY", 1);
-			intent.putExtra("outputX", 256);
-			intent.putExtra("outputY", 256);
-			intent.putExtra("return-data", false);
-			intent.putExtra(MediaStore.EXTRA_OUTPUT, cropFile);
-			intent.putExtra("outputFormat", Bitmap.CompressFormat.JPEG.toString());
-			if (PackageManagerTools.resolveActivity(activity.getPackageManager(), intent, PackageManager.MATCH_DEFAULT_ONLY) == null) {
-				//App.toastUser("Sorry, your device can't crop this image!");
-				intent = null;
-			}
-		}
-		return intent;
-	}
-
-	public boolean endCrop(int resultCode, Intent intent) {
-		LOG.trace("endCrop(resultCode={}, intent={}): {}\nextras={}", resultCode, intent, cropFile,
-				intent != null? StringerTools.toShortString(intent.getExtras()) : null);
-		if (resultCode == Activity.RESULT_CANCELED) {
-			cropFile = null;
-			return false;
-		}
-		cropFile = processReceivedIntent(intent);
-		return true;
-	}
-
-	private File processReceivedIntent(Intent intent) {
-		File file = null;
-		if (intent != null) {
-			file = ImageTools.getFile(activity, intent.getData());
-			thumb = IntentTools.getParcelableExtra(intent, "data", Bitmap.class);
-		}
-		return file;
+		// The `& 0xFF` will truncate the higher bits, so we end up with [0, 255] range.
+		int rand_r = (int)Math.abs(Math.sin(++seed) * 10000) & 0xFF;
+		int rand_g = (int)Math.abs(Math.sin(++seed) * 10000) & 0xFF;
+		int rand_b = (int)Math.abs(Math.sin(++seed) * 10000) & 0xFF;
+
+		// r, g, b in range of [(160 + 0) / 2 = 80, (160 + 255) / 2 = 207]
+		int r = (160 + rand_r) / 2;
+		int g = (160 + rand_g) / 2;
+		int b = (160 + rand_b) / 2;
+		return Color.argb(0xFF, r, g, b);
 	}
 }

android/space/src/main/kotlin/net/twisterrob/inventory/android/space/ManageSpaceUiEffectHandler.kt

@@ -5,11 +5,11 @@ import android.net.Uri
 import android.widget.Toast
 import androidx.activity.result.ActivityResultCaller
 import dagger.hilt.android.qualifiers.ActivityContext
+import net.twisterrob.android.contracts.CreateOpenableDocument
+import net.twisterrob.android.contracts.OpenOpenableDocument
 import net.twisterrob.android.utils.tools.DialogTools
 import net.twisterrob.android.utils.tools.DialogTools.PopupCallbacks
 import net.twisterrob.inventory.android.arch.UiEffectHandler
-import net.twisterrob.inventory.android.content.CreateOpenableDocument
-import net.twisterrob.inventory.android.content.OpenOpenableDocument
 import javax.inject.Inject
 
 internal class ManageSpaceUiEffectHandler @Inject constructor(

android/src/androidTest/java/net/twisterrob/inventory/android/test/activity/ScopedStorageSaver.java

@@ -19,9 +19,9 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.uiautomator.UiObjectNotFoundException;
 
+import net.twisterrob.android.contracts.CreateOpenableDocument;
 import net.twisterrob.android.test.automators.DocumentsUiAutomator;
 import net.twisterrob.android.utils.tools.IOTools;
-import net.twisterrob.inventory.android.content.CreateOpenableDocument;
 
 import static net.twisterrob.android.test.automators.UiAutomatorExtensions.clickOn;
 import static net.twisterrob.android.test.automators.UiAutomatorExtensions.exists;

android/src/main/java/net/twisterrob/inventory/android/activity/MainActivity.java

@@ -16,7 +16,7 @@
 
 import androidx.annotation.*;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.appcompat.widget.SearchView;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentManager.*;
@@ -114,11 +114,10 @@ private BaseFragment<?> getFragment() {
 		welcome();
 	}
 
-	@SuppressLint("RestrictedApi") // MenuBuilder() and add() are used, but only for debugging
 	private void autoDebug() {
 		if (Constants.DISABLE) {
-			onOptionsItemSelected(new MenuBuilder(this)
-					.add(0, R.id.debug, 0, "Debug"));
+			Menu menu = new PopupMenu(this, getWindow().getDecorView()).getMenu();
+			onOptionsItemSelected(menu.add(R.id.debug, R.id.debug_capture, Menu.NONE, "Debug"));
 		}
 	}
 
@@ -357,11 +356,18 @@ public boolean onDebugOptionsItemSelected(MenuItem item) {
 			startActivity(ItemViewActivity.show(10010L));
 			return true;
 		} else if (id == R.id.debug_capture) {
-			File devFile =
-					new File(getExternalFilesDir(Environment.DIRECTORY_PICTURES), "dev.jpg");
-			Uri target = Uri.fromFile(devFile);
-			startActivityForResult(CaptureImage.saveTo(this, devFile, target, 8192),
-					REQUEST_CODE_IMAGE);
+			Uri target;
+			StrictMode.ThreadPolicy originalPolicy = StrictMode.allowThreadDiskWrites();
+			try {
+				File devFile = Constants.Paths.getTempImage(this);
+				target = Constants.Paths.getShareUri(this, devFile);
+			} catch (IOException ex) {
+				throw new RuntimeException(ex);
+			} finally {
+				StrictMode.setThreadPolicy(originalPolicy);
+			}
+			Intent intent = CaptureImage.saveTo(this, target, 8192);
+			startActivityForResult(intent, REQUEST_CODE_IMAGE);
 			return true;
 		} else if (id == R.id.debug_testdb) {
 			resetToTestDatabase();

android/src/main/java/net/twisterrob/inventory/android/fragment/CategoryHelpFragment.java

@@ -27,13 +27,13 @@
 import dagger.hilt.android.AndroidEntryPoint;
 import kotlin.io.FilesKt;
 
+import net.twisterrob.android.contracts.CreateOpenableDocument;
 import net.twisterrob.android.utils.concurrent.SimpleSafeAsyncTask;
 import net.twisterrob.android.utils.tools.AndroidTools;
 import net.twisterrob.inventory.android.*;
 import net.twisterrob.inventory.android.Constants.Paths;
 import net.twisterrob.inventory.android.activity.MainActivity;
 import net.twisterrob.inventory.android.categories.cache.CategoryCache;
-import net.twisterrob.inventory.android.content.CreateOpenableDocument;
 import net.twisterrob.inventory.android.content.Intents;
 import net.twisterrob.inventory.android.content.Intents.Extras;
 import net.twisterrob.inventory.android.content.contract.Category;

android/src/main/java/net/twisterrob/inventory/android/fragment/data/BaseEditFragment.java

@@ -423,7 +423,7 @@ private void getPicture() {
 		try {
 			File file = Constants.Paths.getTempImage(requireContext());
 			Uri fileUri = Paths.getShareUri(requireContext(), file);
-			Intent intent = CaptureImage.saveTo(requireContext(), file, fileUri, 2048/*px*/);
+			Intent intent = CaptureImage.saveTo(requireContext(), fileUri, 2048/*px*/);
 			intent.putExtra(CaptureImage.EXTRA_FORMAT, CompressFormat.JPEG);
 			intent.putExtra(CaptureImage.EXTRA_QUALITY, 85/*%*/);
 			startActivityForResult(intent, REQUEST_CODE_GET_PICTURE);

android/src/main/res/menu/main.xml

@@ -22,7 +22,7 @@
 				<item android:id="@+id/debug_testdb" android:title="Reset to Test DB" />
 				<item android:id="@+id/debug_showCategory" android:title="Show Category" />
 				<item android:id="@+id/debug_showItem" android:title="Show Item" />
-				<item android:id="@+id/debug_capture" android:title="Capture  Image" />
+				<item android:id="@+id/debug_capture" android:title="Capture Image" />
 				<item android:id="@+id/debug_showImage" android:title="Show Image (InventoryProvider)" />
 			</group>
 		</menu>