From 5860825a0945f8809572a1f250f14173e3cc997d Mon Sep 17 00:00:00 2001 From: hismaeel Date: Sat, 17 Feb 2018 11:02:35 -0500 Subject: [PATCH 01/11] Issue #1156 --- .../fr/free/nrw/commons/AboutActivity.java | 40 +++++++++++++++++-- .../commons/media/MediaDetailFragment.java | 23 ++++++++++- .../media/MediaDetailPagerFragment.java | 13 +++++- .../notification/NotificationActivity.java | 15 ++++++- 4 files changed, 83 insertions(+), 8 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 260878b00..7fd96d9bb 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -1,10 +1,13 @@ package fr.free.nrw.commons; +import android.annotation.SuppressLint; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.TextView; +import android.widget.Toast; import butterknife.BindView; import butterknife.ButterKnife; @@ -25,12 +28,12 @@ public class AboutActivity extends NavigationBaseActivity { * @param savedInstanceState Data bundle */ @Override + @SuppressLint("StringFormatInvalid") public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); ButterKnife.bind(this); - String aboutText = getString(R.string.about_license, getString(R.string.trademarked_name)); aboutLicenseText.setHtmlText(aboutText); @@ -42,12 +45,25 @@ public class AboutActivity extends NavigationBaseActivity { public void launchFacebook(View view) { Intent intent; + try { intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://page/" + "1921335171459985")); intent.setPackage("com.facebook.katana"); startActivity(intent); + } catch (Exception e) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/" + "1921335171459985"))); + intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/" + "1921335171459985\\")); + //check if web browser available + 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.show(); + } + } } @@ -56,13 +72,29 @@ public class AboutActivity extends NavigationBaseActivity { public void launchGithub(View view) { Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/commons-app/apps-android-commons\\")); - startActivity(browserIntent); + //check if web browser available + 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.show(); + } } @OnClick(R.id.website_launch_icon) public void launchWebsite(View view) { Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://commons-app.github.io/\\")); - startActivity(browserIntent); + //check if web browser available + 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.show(); + } } } \ No newline at end of file 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 60577ead7..96ce8da29 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 @@ -14,6 +14,7 @@ import android.view.ViewTreeObserver; import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; +import android.widget.Toast; import java.io.IOException; import java.text.SimpleDateFormat; @@ -298,7 +299,15 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { Intent viewIntent = new Intent(); viewIntent.setAction(Intent.ACTION_VIEW); viewIntent.setData(new PageTitle(selectedCategoryTitle).getCanonicalUri()); - startActivity(viewIntent); + //check if web browser available + 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.show(); + } }); } return item; @@ -377,7 +386,17 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { private void openWebBrowser(String url) { Intent browser = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - startActivity(browser); + //check if web browser available + 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.show(); + } + } private void openMap(LatLng coordinates) { 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 d70b515bb..f0e0c635b 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 @@ -24,6 +24,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.widget.Toast; import javax.inject.Inject; import javax.inject.Named; @@ -114,7 +115,17 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple Intent viewIntent = new Intent(); viewIntent.setAction(ACTION_VIEW); viewIntent.setData(m.getFilePageTitle().getMobileUri()); - startActivity(viewIntent); + //check if web browser available + 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.show(); + } + return true; case R.id.menu_download_current_image: // Download 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 c90e61318..20efa40e1 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 @@ -7,6 +7,7 @@ import android.net.Uri; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.widget.Toast; import com.pedrogomez.renderers.RVRendererAdapter; @@ -66,10 +67,22 @@ public class NotificationActivity extends NavigationBaseActivity { } private void handleUrl(String url) { + if (url == null || url.equals("")) { return; } - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + + 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.show(); + } + } private void setAdapter(List notificationList) { From 6b63fad4071ba6f299a9032afe98049fc8028204 Mon Sep 17 00:00:00 2001 From: hismaeel Date: Sat, 17 Feb 2018 12:42:57 -0500 Subject: [PATCH 02/11] issue 1130 (b) --- .../java/fr/free/nrw/commons/media/MediaDetailFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 5f41007ff..9b6bf02a1 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 @@ -274,7 +274,9 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { } private void setOnClickListeners(final Media media) { - license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); + if (licenseLink(media) != null) { + license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); + } if (media.getCoordinates() != null) { coordinates.setOnClickListener(v -> openMap(media.getCoordinates())); } From 1132e57feba143e88f1590baeb285a3d855e33a4 Mon Sep 17 00:00:00 2001 From: Hassan Date: Sun, 18 Feb 2018 01:17:55 -0500 Subject: [PATCH 03/11] Reverting 1130(b) Creating separate PR for 1130 --- .../java/fr/free/nrw/commons/media/MediaDetailFragment.java | 2 -- 1 file changed, 2 deletions(-) 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 9b6bf02a1..4437fc9e6 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 @@ -274,9 +274,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { } private void setOnClickListeners(final Media media) { - if (licenseLink(media) != null) { license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); - } if (media.getCoordinates() != null) { coordinates.setOnClickListener(v -> openMap(media.getCoordinates())); } From ce9795cdfa049a93b63b26e989a6f6d3de34442a Mon Sep 17 00:00:00 2001 From: Hassan Date: Sun, 18 Feb 2018 10:37:36 -0500 Subject: [PATCH 04/11] Indent fix --- .../java/fr/free/nrw/commons/media/MediaDetailFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4437fc9e6..5f41007ff 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 @@ -274,7 +274,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { } private void setOnClickListeners(final Media media) { - license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); + license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); if (media.getCoordinates() != null) { coordinates.setOnClickListener(v -> openMap(media.getCoordinates())); } From 52a1ed459faed3e4d98455bd45374c4bb2e2757c Mon Sep 17 00:00:00 2001 From: hismaeel Date: Tue, 20 Feb 2018 17:42:25 -0500 Subject: [PATCH 05/11] issue #1130 (b) --- .../java/fr/free/nrw/commons/media/MediaDetailFragment.java | 3 +++ 1 file changed, 3 insertions(+) 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 9b6bf02a1..f582a778e 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 @@ -276,6 +276,9 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { private void setOnClickListeners(final Media media) { if (licenseLink(media) != null) { license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); + } else { + Toast toast = Toast.makeText(getContext(), getString(R.string.description_info), Toast.LENGTH_SHORT); + toast.show(); } if (media.getCoordinates() != null) { coordinates.setOnClickListener(v -> openMap(media.getCoordinates())); From 683eb158125355e27e0e8d17c91075b124140693 Mon Sep 17 00:00:00 2001 From: hismaeel Date: Tue, 20 Feb 2018 17:42:48 -0500 Subject: [PATCH 06/11] issue #1130 (b) --- app/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ceba924e1..fecfff942 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -211,6 +211,7 @@ Send log file Send log file to developers via email Login to your account + URL not found Location has not changed. Location not available. From 33f6c5053055232c28d7b886ceec7d6a7bddb04b Mon Sep 17 00:00:00 2001 From: Hassan Date: Tue, 20 Feb 2018 18:58:22 -0500 Subject: [PATCH 07/11] Reverting 1130 Still finding way around VCS :-)) Will make separate PR for 1130 (b) --- .../fr/free/nrw/commons/media/MediaDetailFragment.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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..5f41007ff 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 @@ -274,12 +274,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { } private void setOnClickListeners(final Media media) { - if (licenseLink(media) != null) { - license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); - } else { - Toast toast = Toast.makeText(getContext(), getString(R.string.description_info), Toast.LENGTH_SHORT); - toast.show(); - } + license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); if (media.getCoordinates() != null) { coordinates.setOnClickListener(v -> openMap(media.getCoordinates())); } From f9b99f9280d0d09a5d0c46ae7e17ffa3088b025e Mon Sep 17 00:00:00 2001 From: hismaeel Date: Tue, 20 Feb 2018 21:38:22 -0500 Subject: [PATCH 08/11] 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. From 163e840c126c9c8e9a631201fc16ee956f75b803 Mon Sep 17 00:00:00 2001 From: Hassan Date: Wed, 21 Feb 2018 11:52:15 -0500 Subject: [PATCH 09/11] White Spaces fix --- .../java/fr/free/nrw/commons/media/MediaDetailFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 48ba70d07..4c38af529 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 @@ -389,7 +389,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { private void openWebBrowser(String url) { Intent browser = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); //check if web browser available - if(browser.resolveActivity(getActivity().getPackageManager()) != null){ + if (browser.resolveActivity(getActivity().getPackageManager()) != null) { startActivity(browser); } else { Toast toast = Toast.makeText(getContext(), getString(R.string.no_web_browser), LENGTH_SHORT); From 167dabc73dfd6eaee23d32d0eca8eea71106d216 Mon Sep 17 00:00:00 2001 From: Hassan Date: Wed, 21 Feb 2018 12:05:52 -0500 Subject: [PATCH 10/11] Update strings.xml --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd8d60f81..79614f218 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -213,7 +213,7 @@ Login to your account Send log file Send log file to developers via email - No app found to open URL + No web browser found to open URL Location has not changed. Location not available. From 8addd10ef8177d730dd206fd02e1c447d2ae0fda Mon Sep 17 00:00:00 2001 From: Hassan Date: Wed, 28 Feb 2018 13:07:50 -0500 Subject: [PATCH 11/11] update PR quality --- .../main/java/fr/free/nrw/commons/AboutActivity.java | 10 +--------- 1 file changed, 1 insertion(+), 9 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 1b27c86b7..91a4f6eb9 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -47,17 +47,13 @@ public class AboutActivity extends NavigationBaseActivity { @OnClick(R.id.facebook_launch_icon) public void launchFacebook(View view) { - Intent intent; - try { intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://page/" + "1921335171459985")); intent.setPackage("com.facebook.katana"); startActivity(intent); - } catch (Exception e) { intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/" + "1921335171459985\\")); - //check if web browser available if(intent.resolveActivity(this.getPackageManager()) != null){ Utils.handleWebUrl(this,Uri.parse("https://www.facebook.com/" + "1921335171459985")); } else { @@ -82,7 +78,6 @@ public class AboutActivity extends NavigationBaseActivity { @OnClick(R.id.website_launch_icon) public void launchWebsite(View view) { Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://commons-app.github.io/\\")); - //check if web browser available if (browserIntent.resolveActivity(this.getPackageManager()) != null) { Utils.handleWebUrl(this,Uri.parse("https://commons-app.github.io/\\")); } else { @@ -95,7 +90,6 @@ public class AboutActivity extends NavigationBaseActivity { @OnClick(R.id.about_credits) public void launchCredits(View view) { Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/commons-app/apps-android-commons/blob/master/CREDITS/\\")); - //check if web browser available if (browserIntent.resolveActivity(this.getPackageManager()) != null) { Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/blob/master/CREDITS/\\")); } else { @@ -107,14 +101,12 @@ public class AboutActivity extends NavigationBaseActivity { @OnClick(R.id.about_privacy_policy) public void launchPrivacyPolicy(View view) { Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\")); - //check if web browser available if (browserIntent.resolveActivity(this.getPackageManager()) != null) { Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\")); } else { Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT); toast.show(); } - } -} \ No newline at end of file +}