From 129ccd3cb4e8f80e305f7a92b8b132badc87f5fc Mon Sep 17 00:00:00 2001 From: naman653 Date: Sat, 11 Jan 2020 06:52:20 +0530 Subject: [PATCH 1/2] fix: using app without odk collect installed --- .../org/odk/share/views/ui/main/MainActivity.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/skunkworks_crow/src/main/java/org/odk/share/views/ui/main/MainActivity.java b/skunkworks_crow/src/main/java/org/odk/share/views/ui/main/MainActivity.java index 20175c5b..a3193e3a 100644 --- a/skunkworks_crow/src/main/java/org/odk/share/views/ui/main/MainActivity.java +++ b/skunkworks_crow/src/main/java/org/odk/share/views/ui/main/MainActivity.java @@ -60,6 +60,7 @@ public class MainActivity extends FormListActivity implements LoaderManager.Load private static final String FORM_CHOOSER_LIST_SORTING_ORDER = "formChooserListSortingOrder"; private static final String COLLECT_PACKAGE = "org.odk.collect.android"; private static final int STORAGE_PERMISSION_REQUEST_CODE = 101; + private static final int COLLECT_INSTALL_REQUEST_CODE = 102; private static final int FORM_LOADER = 2; @BindView(R.id.toolbar) @@ -213,9 +214,12 @@ private void showAlertDialog() { builder.setPositiveButton(getString(R.string.install), (DialogInterface dialog, int which) -> { try { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + COLLECT_PACKAGE))); + startActivityForResult(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + COLLECT_PACKAGE)), + COLLECT_INSTALL_REQUEST_CODE); } catch (ActivityNotFoundException e) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + COLLECT_PACKAGE))); + startActivityForResult(new Intent(Intent.ACTION_VIEW, + Uri.parse("https://play.google.com/store/apps/details?id=" + COLLECT_PACKAGE)), + COLLECT_INSTALL_REQUEST_CODE); } }); @@ -277,6 +281,11 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten setUpLoader(); } } + if (requestCode == COLLECT_INSTALL_REQUEST_CODE) { + if(!isCollectInstalled()) { + setUpLoader(); + } + } } private void setUpLoader() { From 3e0d69de8392ff44cbf2bf5b382e0000262a1e5b Mon Sep 17 00:00:00 2001 From: naman653 Date: Sat, 11 Jan 2020 17:41:49 +0530 Subject: [PATCH 2/2] fix: check style issues --- .../src/main/java/org/odk/share/views/ui/main/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skunkworks_crow/src/main/java/org/odk/share/views/ui/main/MainActivity.java b/skunkworks_crow/src/main/java/org/odk/share/views/ui/main/MainActivity.java index a3193e3a..55e3d3f7 100644 --- a/skunkworks_crow/src/main/java/org/odk/share/views/ui/main/MainActivity.java +++ b/skunkworks_crow/src/main/java/org/odk/share/views/ui/main/MainActivity.java @@ -282,7 +282,7 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten } } if (requestCode == COLLECT_INSTALL_REQUEST_CODE) { - if(!isCollectInstalled()) { + if (!isCollectInstalled()) { setUpLoader(); } }