From dc60a39ffebb97e3203ded3118d6c9293dd2d34e Mon Sep 17 00:00:00 2001 From: Harry Bond Date: Wed, 31 Jul 2024 17:18:01 +0100 Subject: [PATCH] [Android] make sendbugreport use mShareLauncher utils.sendBugReport refactoring added mShareLauncher as a parameter. Because the two PRs were created at the same time, my code didn't have it. now fixed :) also fixed indentation Signed-off-by: Harry Bond --- .../java/app/organicmaps/SplashActivity.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java index c7f376e5f7..0a11ab35ff 100644 --- a/android/app/src/main/java/app/organicmaps/SplashActivity.java +++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java @@ -21,6 +21,7 @@ import app.organicmaps.display.DisplayManager; import app.organicmaps.location.LocationHelper; import app.organicmaps.util.Config; import app.organicmaps.util.LocationUtils; +import app.organicmaps.util.SharingUtils; import app.organicmaps.util.ThemeUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.concurrency.UiThread; @@ -41,6 +42,8 @@ public class SplashActivity extends AppCompatActivity @SuppressWarnings("NotNullFieldNotInitialized") @NonNull private ActivityResultLauncher mPermissionRequest; + @NonNull + private ActivityResultLauncher mShareLauncher; @NonNull private final Runnable mInitCoreDelayedTask = this::init; @@ -63,6 +66,7 @@ public class SplashActivity extends AppCompatActivity setContentView(R.layout.activity_splash); mPermissionRequest = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), result -> Config.setLocationRequested()); + mShareLauncher = SharingUtils.RegisterLauncher(this); if (DisplayManager.from(this).isCarDisplayUsed()) { @@ -109,18 +113,19 @@ public class SplashActivity extends AppCompatActivity { mCanceled = true; new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) - .setTitle(titleId) - .setMessage(messageId) - .setPositiveButton( - R.string.report_a_bug, - (dialog, which) -> Utils.sendBugReport( - this, - "Fatal Error", - Log.getStackTraceString(error) - ) + .setTitle(titleId) + .setMessage(messageId) + .setPositiveButton( + R.string.report_a_bug, + (dialog, which) -> Utils.sendBugReport( + mShareLauncher, + this, + "Fatal Error", + Log.getStackTraceString(error) ) - .setCancelable(false) - .show(); + ) + .setCancelable(false) + .show(); } private void init()