Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly navigate to the Updates view from notification.

Browse Source
This commit is contained in:
Peter Serwylo 2017-03-14 15:56:29 +11:00
parent 77f3a5feff
commit 7b77919432
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
View File

@ -410,7 +410,8 @@ class NotificationHelper {
// Intent to open main app list // Intent to open main app list
Intent intentObject = new Intent(context, MainActivity.class); 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 = NotificationCompat.Builder builder =
new NotificationCompat.Builder(context) new NotificationCompat.Builder(context)

4
app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
View File

@ -56,6 +56,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV
private RecyclerView pager; private RecyclerView pager;
private MainViewAdapter adapter; private MainViewAdapter adapter;
private BottomNavigationView bottomNavigation;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -70,7 +71,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV
pager.setLayoutManager(new NonScrollingHorizontalLayoutManager(this)); pager.setLayoutManager(new NonScrollingHorizontalLayoutManager(this));
pager.setAdapter(adapter); pager.setAdapter(adapter);
BottomNavigationView bottomNavigation = (BottomNavigationView) findViewById(R.id.bottom_navigation); bottomNavigation = (BottomNavigationView) findViewById(R.id.bottom_navigation);
bottomNavigation.setOnNavigationItemSelectedListener(this); bottomNavigation.setOnNavigationItemSelectedListener(this);
initialRepoUpdateIfRequired(); initialRepoUpdateIfRequired();
@ -102,6 +103,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV
if (getIntent().hasExtra(EXTRA_VIEW_UPDATES)) { if (getIntent().hasExtra(EXTRA_VIEW_UPDATES)) {
getIntent().removeExtra(EXTRA_VIEW_UPDATES); getIntent().removeExtra(EXTRA_VIEW_UPDATES);
pager.scrollToPosition(adapter.adapterPositionFromItemId(R.id.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 // AppDetails 2 and RepoDetailsActivity set different NFC actions, so reset here