From f9b99f9280d0d09a5d0c46ae7e17ffa3088b025e Mon Sep 17 00:00:00 2001 From: hismaeel Date: Tue, 20 Feb 2018 21:38:22 -0500 Subject: [PATCH] issue #1156 fix --- .../java/fr/free/nrw/commons/AboutActivity.java | 15 +++++---------- .../nrw/commons/media/MediaDetailFragment.java | 11 ++++------- .../commons/media/MediaDetailPagerFragment.java | 6 ++---- .../notification/NotificationActivity.java | 9 +++------ app/src/main/res/values/strings.xml | 2 +- 5 files changed, 15 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index 46e1441d6..a2635d0dc 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -15,6 +15,8 @@ import butterknife.OnClick; import fr.free.nrw.commons.theme.NavigationBaseActivity; import fr.free.nrw.commons.ui.widget.HtmlTextView; +import static android.widget.Toast.LENGTH_SHORT; + /** * Represents about screen of this app */ @@ -57,10 +59,7 @@ public class AboutActivity extends NavigationBaseActivity { if(intent.resolveActivity(this.getPackageManager()) != null){ startActivity(intent); } else { - CharSequence text = "No app found to open URL"; - int duration = Toast.LENGTH_SHORT; - - Toast toast = Toast.makeText(this, text, duration); + Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT); toast.show(); } @@ -76,9 +75,7 @@ public class AboutActivity extends NavigationBaseActivity { if (browserIntent.resolveActivity(this.getPackageManager()) != null) { startActivity(browserIntent); } else { - CharSequence text = "No app found to open URL"; - int duration = Toast.LENGTH_SHORT; - Toast toast = Toast.makeText(this, text, duration); + Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT); toast.show(); } } @@ -91,9 +88,7 @@ public class AboutActivity extends NavigationBaseActivity { if (browserIntent.resolveActivity(this.getPackageManager()) != null) { startActivity(browserIntent); } else { - CharSequence text = "No app found to open URL"; - int duration = Toast.LENGTH_SHORT; - Toast toast = Toast.makeText(this, text, duration); + Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT); toast.show(); } } diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index f582a778e..aabfe1c81 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -37,6 +37,8 @@ import fr.free.nrw.commons.location.LatLng; import fr.free.nrw.commons.ui.widget.CompatTextView; import timber.log.Timber; +import static android.widget.Toast.LENGTH_SHORT; + public class MediaDetailFragment extends CommonsDaggerSupportFragment { private boolean editable; @@ -309,9 +311,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { if(viewIntent.resolveActivity(getActivity().getPackageManager()) != null){ startActivity(viewIntent); } else { - CharSequence text = "No app found to open URL"; - int duration = Toast.LENGTH_SHORT; - Toast toast = Toast.makeText(getContext(), text, duration); + Toast toast = Toast.makeText(getContext(), getString(R.string.no_web_browser), LENGTH_SHORT); toast.show(); } }); @@ -397,10 +397,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { if(browser.resolveActivity(getActivity().getPackageManager()) != null){ startActivity(browser); } else { - CharSequence text = "No app found to open URL"; - int duration = Toast.LENGTH_SHORT; - - Toast toast = Toast.makeText(getContext(), text, duration); + Toast toast = Toast.makeText(getContext(), getString(R.string.no_web_browser), LENGTH_SHORT); toast.show(); } diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index d1f4ffd97..be7aea836 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -41,6 +41,7 @@ import static android.Manifest.permission.READ_EXTERNAL_STORAGE; import static android.content.Context.DOWNLOAD_SERVICE; import static android.content.Intent.ACTION_VIEW; import static android.content.pm.PackageManager.PERMISSION_GRANTED; +import static android.widget.Toast.LENGTH_SHORT; public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment implements ViewPager.OnPageChangeListener { @@ -123,10 +124,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple if(viewIntent.resolveActivity(getActivity().getPackageManager()) != null){ startActivity(viewIntent); } else { - CharSequence text = "No app found to open URL"; - int duration = Toast.LENGTH_SHORT; - - Toast toast = Toast.makeText(getContext(), text, duration); + Toast toast = Toast.makeText(getContext(), getString(R.string.no_web_browser), LENGTH_SHORT); toast.show(); } diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java index 43e880ba2..39d5252ee 100644 --- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java @@ -24,6 +24,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import timber.log.Timber; +import static android.widget.Toast.LENGTH_SHORT; + /** * Created by root on 18.12.2017. */ @@ -65,22 +67,17 @@ public class NotificationActivity extends NavigationBaseActivity { } private void handleUrl(String url) { - if (url == null || url.equals("")) { return; } - Intent browser = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); //check if web browser available if(browser.resolveActivity(this.getPackageManager()) != null){ startActivity(browser); } else { - CharSequence text = "No app found to open URL"; - int duration = Toast.LENGTH_SHORT; - Toast toast = Toast.makeText(this, text, duration); + Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT); toast.show(); } - } private void setAdapter(List notificationList) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fecfff942..9f8f30ccb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -211,7 +211,7 @@ Send log file Send log file to developers via email Login to your account - URL not found + No app found to open URL Location has not changed. Location not available.