From 7b7791943223f064f92a7fccb1403a8f5f19616f Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Tue, 14 Mar 2017 15:56:29 +1100 Subject: [PATCH] Correctly navigate to the Updates view from notification. --- app/src/main/java/org/fdroid/fdroid/NotificationHelper.java | 3 ++- .../main/java/org/fdroid/fdroid/views/main/MainActivity.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java index 9a5e13215..258ef046b 100644 --- a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java @@ -410,7 +410,8 @@ class NotificationHelper { // Intent to open main app list Intent intentObject = new Intent(context, MainActivity.class); - PendingIntent piAction = PendingIntent.getActivity(context, 0, intentObject, 0); + intentObject.putExtra(MainActivity.EXTRA_VIEW_UPDATES, true); + PendingIntent piAction = PendingIntent.getActivity(context, 0, intentObject, PendingIntent.FLAG_UPDATE_CURRENT); NotificationCompat.Builder builder = new NotificationCompat.Builder(context) 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 cfcd37f8b..3e2a78ede 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 @@ -56,6 +56,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV private RecyclerView pager; private MainViewAdapter adapter; + private BottomNavigationView bottomNavigation; @Override protected void onCreate(Bundle savedInstanceState) { @@ -70,7 +71,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV pager.setLayoutManager(new NonScrollingHorizontalLayoutManager(this)); pager.setAdapter(adapter); - BottomNavigationView bottomNavigation = (BottomNavigationView) findViewById(R.id.bottom_navigation); + bottomNavigation = (BottomNavigationView) findViewById(R.id.bottom_navigation); bottomNavigation.setOnNavigationItemSelectedListener(this); initialRepoUpdateIfRequired(); @@ -102,6 +103,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV if (getIntent().hasExtra(EXTRA_VIEW_UPDATES)) { getIntent().removeExtra(EXTRA_VIEW_UPDATES); pager.scrollToPosition(adapter.adapterPositionFromItemId(R.id.updates)); + bottomNavigation.findViewById(R.id.updates).performClick(); } // AppDetails 2 and RepoDetailsActivity set different NFC actions, so reset here