Fix possible issue related to Proguard ID obfuscation

Sometimes tapping notifications opened the wrong section
ABCRic · Nov 3, 2017 · 92c2804 · 92c2804
1 parent 4ce0914
commit 92c2804
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/app/src/main/java/im/tny/segvault/disturbances/MainActivity.java b/app/src/main/java/im/tny/segvault/disturbances/MainActivity.java
@@ -96,7 +96,10 @@ protected void onCreate(Bundle savedInstanceState) {
             // show initial fragment
             Fragment newFragment = null;
             if (getIntent() != null) {
-                newFragment = getNewFragment(getIntent().getIntExtra(EXTRA_INITIAL_FRAGMENT, R.id.nav_home));
+                String id = getIntent().getStringExtra(EXTRA_INITIAL_FRAGMENT);
+                if (id != null) {
+                    newFragment = getNewFragment(pageStringToResourceId(id));
+                }
             }
             if (newFragment == null) {
                 newFragment = new HomeFragment();
@@ -216,7 +219,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
         SharedPreferences sharedPref = getSharedPreferences("settings", MODE_PRIVATE);
         boolean devMode = sharedPref.getBoolean("pref_developer_mode", false);
-        if(!devMode) {
+        if (!devMode) {
             menu.findItem(R.id.menu_debug).setVisible(false);
         }
 
@@ -255,6 +258,33 @@ private Fragment getNewFragment(int id) {
         }
     }
 
+    private static int pageStringToResourceId(String id) {
+        switch (id) {
+            case "nav_home":
+                return R.id.nav_home;
+            case "nav_plan_route":
+                return R.id.nav_plan_route;
+            case "nav_trip_history":
+                return R.id.nav_trip_history;
+            case "nav_map":
+                return R.id.nav_map;
+            case "nav_announcements":
+                return R.id.nav_announcements;
+            case "nav_disturbances":
+                return R.id.nav_disturbances;
+            case "nav_notif":
+                return R.id.nav_notif;
+            case "nav_settings":
+                return R.id.nav_settings;
+            case "nav_help":
+                return R.id.nav_help;
+            case "nav_about":
+                return R.id.nav_about;
+            default:
+                return R.id.nav_home;
+        }
+    }
+
     private void replaceFragment(Fragment newFragment, boolean addToBackStack) {
         Fragment currentFragment = getSupportFragmentManager().findFragmentById(R.id.main_fragment_container);
         if (currentFragment == null || !currentFragment.isAdded()) {

diff --git a/app/src/main/java/im/tny/segvault/disturbances/MainService.java b/app/src/main/java/im/tny/segvault/disturbances/MainService.java
@@ -915,7 +915,7 @@ private void handleDisturbanceNotification(String network, String line,
         }
 
         Intent intent = new Intent(this, MainActivity.class);
-        intent.putExtra(MainActivity.EXTRA_INITIAL_FRAGMENT, R.id.nav_disturbances);
+        intent.putExtra(MainActivity.EXTRA_INITIAL_FRAGMENT, "nav_disturbances");
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
 
         String title = String.format(getString(R.string.notif_disturbance_title), sline.getName());
@@ -1031,7 +1031,7 @@ private void updateRouteNotification(S2LS loc) {
 
     private void updateRouteNotification(S2LS loc, boolean highPriorityNotification) {
         Intent intent = new Intent(this, MainActivity.class);
-        intent.putExtra(MainActivity.EXTRA_INITIAL_FRAGMENT, R.id.nav_home);
+        intent.putExtra(MainActivity.EXTRA_INITIAL_FRAGMENT, "nav_home");
         PendingIntent pendingIntent = PendingIntent.getActivity(this, (int) System.currentTimeMillis(),
                 intent, 0);