mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix #2044 by not stopping MainActivity when looking at notifications (#2102)

Browse source
This commit is contained in:
Adam Jones 2019-01-08 17:17:06 +00:00 • committed by Vivek Maskara
parent 164ef9bcac
commit 1560540c72
2 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
View file

@ -315,10 +315,8 @@ public class MainActivity extends AuthenticatedActivity implements FragmentManag
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.notifications: case R.id.notifications:
// Starts notification activity on click to notification icon // Starts notification activity on click to notification icon
NavigationBaseActivity.startActivityWithFlags(this, NotificationActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP); NotificationActivity.startYourself(this);
finish();
return true; return true;
case R.id.list_sheet: case R.id.list_sheet:
if (contributionsActivityPagerAdapter.getItem(1) != null) { if (contributionsActivityPagerAdapter.getItem(1) != null) {
((NearbyFragment)contributionsActivityPagerAdapter.getItem(1)).listOptionMenuIteClicked(); ((NearbyFragment)contributionsActivityPagerAdapter.getItem(1)).listOptionMenuIteClicked();

6
app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
View file

@ -147,10 +147,4 @@ public class NotificationActivity extends NavigationBaseActivity {
.commit(); .commit();
mNotificationWorkerFragment.setNotificationList(notificationList); mNotificationWorkerFragment.setNotificationList(notificationList);
} }
@Override
public void onBackPressed() {
startActivityWithFlags(
this, MainActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP,
Intent.FLAG_ACTIVITY_SINGLE_TOP); }
} }