organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[Android] make sendbugreport use mShareLauncher

Browse source 
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 <me@hbond.xyz>
This commit is contained in:
Harry Bond 2024-07-31 17:18:01 +01:00 • committed by Viktor Havaka
parent bf5825733e
commit dc60a39ffe
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
android/app/src/main/java/app/organicmaps/SplashActivity.java
View file

@ -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<String[]> mPermissionRequest;
@NonNull
private ActivityResultLauncher<SharingUtils.SharingIntent> 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()