From 23b296a012f7f55c71160d25200645709fbc93f6 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 8 Aug 2018 18:16:19 +0200
Subject: [PATCH] add Intent Extra to force Nearby tab to show, like the other
 tabs have

---
 .../java/org/fdroid/fdroid/views/main/MainActivity.java     | 6 ++++++
 .../java/org/fdroid/fdroid/views/main/MainViewAdapter.java  | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
index 28d0ec5a3..48a787156 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
@@ -86,6 +86,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationB
     private static final String TAG = "MainActivity";
 
     public static final String EXTRA_VIEW_UPDATES = "org.fdroid.fdroid.views.main.MainActivity.VIEW_UPDATES";
+    public static final String EXTRA_VIEW_NEARBY = "org.fdroid.fdroid.views.main.MainActivity.VIEW_NEARBY";
     public static final String EXTRA_VIEW_SETTINGS = "org.fdroid.fdroid.views.main.MainActivity.VIEW_SETTINGS";
 
     static final int REQUEST_LOCATION_PERMISSIONS = 0xEF0F;
@@ -219,6 +220,11 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationB
             pager.scrollToPosition(adapter.adapterPositionFromItemId(R.id.updates));
             selectedMenuId = R.id.updates;
             setSelectedMenuInNav();
+        } else if (getIntent().hasExtra(EXTRA_VIEW_NEARBY)) {
+            getIntent().removeExtra(EXTRA_VIEW_NEARBY);
+            pager.scrollToPosition(adapter.adapterPositionFromItemId(R.id.nearby));
+            selectedMenuId = R.id.nearby;
+            setSelectedMenuInNav();
         } else if (getIntent().hasExtra(EXTRA_VIEW_SETTINGS)) {
             getIntent().removeExtra(EXTRA_VIEW_SETTINGS);
             pager.scrollToPosition(adapter.adapterPositionFromItemId(R.id.settings));
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
index a670fd2d0..2f4dc97bb 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
@@ -82,7 +82,7 @@ class MainViewAdapter extends RecyclerView.Adapter<MainViewController> {
     @NonNull
     @Override
     public MainViewController onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        MainViewController holder = createEmptyView();
+        MainViewController holder = createEmptyView(activity);
         switch (viewType) {
             case R.id.whats_new:
                 holder.bindWhatsNewView();
@@ -106,7 +106,7 @@ class MainViewAdapter extends RecyclerView.Adapter<MainViewController> {
         return holder;
     }
 
-    private MainViewController createEmptyView() {
+    static MainViewController createEmptyView(AppCompatActivity activity) {
         FrameLayout frame = new FrameLayout(activity);
         frame.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT));