From b81509dd32c78da451e5e371f352598c3900b421 Mon Sep 17 00:00:00 2001 From: Fox2Code Date: Wed, 26 Jan 2022 15:52:32 +0100 Subject: [PATCH] Improve IntentHelper openFile debug log, and use 64bit secret instead of 32bit secret. --- app/src/main/java/com/fox2code/mmm/MainApplication.java | 6 +++--- app/src/main/java/com/fox2code/mmm/utils/IntentHelper.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/fox2code/mmm/MainApplication.java b/app/src/main/java/com/fox2code/mmm/MainApplication.java index 9cd2f85..ddff07f 100644 --- a/app/src/main/java/com/fox2code/mmm/MainApplication.java +++ b/app/src/main/java/com/fox2code/mmm/MainApplication.java @@ -51,7 +51,7 @@ public class MainApplication extends Application implements CompatActivity.Appli private static SimpleDateFormat timeFormat = new SimpleDateFormat(timeFormatString, timeFormatLocale); private static final Shell.Builder shellBuilder; - private static final int secret; + private static final long secret; private static SharedPreferences bootSharedPreferences; private static MainApplication INSTANCE; private static boolean firstBoot; @@ -61,7 +61,7 @@ public class MainApplication extends Application implements CompatActivity.Appli .setFlags(Shell.FLAG_REDIRECT_STDERR) .setTimeout(10).setInitializers(InstallerInitializer.class) ); - secret = new Random().nextInt(); + secret = new Random().nextLong(); } public MainApplication() { @@ -79,7 +79,7 @@ public class MainApplication extends Application implements CompatActivity.Appli } public static boolean checkSecret(Intent intent) { - return intent.getIntExtra("secret", ~secret) == secret; + return intent.getLongExtra("secret", ~secret) == secret; } public static SharedPreferences getSharedPreferences() { diff --git a/app/src/main/java/com/fox2code/mmm/utils/IntentHelper.java b/app/src/main/java/com/fox2code/mmm/utils/IntentHelper.java index d46a69e..dbde641 100644 --- a/app/src/main/java/com/fox2code/mmm/utils/IntentHelper.java +++ b/app/src/main/java/com/fox2code/mmm/utils/IntentHelper.java @@ -208,7 +208,7 @@ public class IntentHelper { Files.copy(inputStream, outputStream); success = true; } catch (Exception e) { - Log.e("IntentHelper", "fail copy", e); + Log.e("IntentHelper", "failed copy of " + uri, e); Toast.makeText(compatActivity, R.string.file_picker_failure, Toast.LENGTH_SHORT).show();