From 74cd74f869c2813753b356e731630668b8d37787 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Mon, 16 Dec 2019 09:29:24 +0800
Subject: [PATCH] Avoid android java crash when opening url
---
android/src/main/java/SuperTuxKartActivity.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/android/src/main/java/SuperTuxKartActivity.java b/android/src/main/java/SuperTuxKartActivity.java
index abfa63bfd..470b0b4bd 100644
--- a/android/src/main/java/SuperTuxKartActivity.java
+++ b/android/src/main/java/SuperTuxKartActivity.java
@@ -3,8 +3,10 @@ package org.supertuxkart.stk_dbg;
import org.supertuxkart.stk_dbg.STKEditText;
import android.app.NativeActivity;
+import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.graphics.Rect;
import android.net.Uri;
import android.os.Build;
@@ -185,9 +187,17 @@ public class SuperTuxKartActivity extends NativeActivity
/* Called by STK in JNI. */
public void openURL(final String url)
{
- Intent i = new Intent(Intent.ACTION_VIEW);
- i.setData(Uri.parse(url));
- startActivity(i);
+ try
+ {
+ Uri uri = Uri.parse(url);
+ Intent i = new Intent(Intent.ACTION_VIEW, uri);
+ if (i.resolveActivity(getPackageManager()) != null)
+ startActivity(i);
+ }
+ catch (ActivityNotFoundException e)
+ {
+ e.printStackTrace();
+ }
}
// ------------------------------------------------------------------------
/* Called by STK in JNI. */