From 1dee56c2210d66a60e20d8c66636abfe64004cd5 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 5 Oct 2019 08:50:24 +0200 Subject: [PATCH] Fix URL issue --- .../app/fedilab/android/activities/ShowAccountActivity.java | 4 ++-- .../java/app/fedilab/android/activities/WebviewActivity.java | 2 +- .../main/java/app/fedilab/android/client/Entities/Status.java | 4 ++-- app/src/main/java/app/fedilab/android/helper/Helper.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java index 2996f982c..39dad7511 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java @@ -429,7 +429,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt warning_message.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (!accountUrl.startsWith("http://") && !accountUrl.startsWith("https://")) + if (!accountUrl.toLowerCase().startsWith("http://") && !accountUrl.toLowerCase().startsWith("https://")) accountUrl = "http://" + accountUrl; Helper.openBrowser(ShowAccountActivity.this, accountUrl); } @@ -1458,7 +1458,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt return true; case R.id.action_open_browser: if (accountUrl != null) { - if (!accountUrl.startsWith("http://") && !accountUrl.startsWith("https://")) + if (!accountUrl.toLowerCase().startsWith("http://") && !accountUrl.toLowerCase().startsWith("https://")) accountUrl = "http://" + accountUrl; Helper.openBrowser(ShowAccountActivity.this, accountUrl); } diff --git a/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java b/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java index fe9ec7ca2..fc2906a19 100644 --- a/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java @@ -163,7 +163,7 @@ public class WebviewActivity extends BaseActivity { } } }); - if (!url.startsWith("http://") && !url.startsWith("https://")) + if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://")) url = "http://" + url; if (trackingDomains == null) { AsyncTask.execute(new Runnable() { diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java index 759fd1596..adcfc0d83 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java @@ -987,7 +987,7 @@ public class Status implements Parcelable { intent.putExtras(b); context.startActivity(intent); } else { - if (!url.startsWith("http://") && !url.startsWith("https://")) + if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://")) finalUrl = "http://" + url; Helper.openBrowser(context, finalUrl); } @@ -1116,7 +1116,7 @@ public class Status implements Parcelable { @Override public void onClick(@NonNull View textView) { String finalUrl = url; - if (!url.startsWith("http://") && !url.startsWith("https://")) + if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://")) finalUrl = "http://" + url; Helper.openBrowser(context, finalUrl); } diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index 3179b17e9..67184a106 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -3428,7 +3428,7 @@ public class Helper { Intent intent = new Intent(context, WebviewActivity.class); Bundle b = new Bundle(); String finalUrl = url; - if (!url.startsWith("http://") && !url.startsWith("https://")) + if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://")) finalUrl = "http://" + url; b.putString("url", finalUrl); intent.putExtras(b);