Resource IDs won't be constant anymore in upcoming android gradle plugin

so cannot use R.id.foo anymore in switch statements, convert those to
if/else instead

Change-Id: I2cdd9b5cddd40a4d227ea214a42ef861d48fbe51

5 files changed, 55 insertions, 80 deletions

diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
index b15ed3a..be6b8ab 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
@@ -47,17 +47,11 @@ public class ComputerCreationActivity extends AppCompatActivity implements View.
 
     @Override
     public void onClick(View aView) {
-        switch (aView.getId()) {
-            case R.id.button_cancel:
-                cancelCreation();
-                break;
-
-            case R.id.button_save:
-                saveServer();
-                break;
-
-            default:
-                break;
+        int id = aView.getId();
+        if (id == R.id.button_cancel) {
+            cancelCreation();
+        } else if (id == R.id.button_save) {
+            saveServer();
         }
     }
 
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
index 0082ace..53c9b3b 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
@@ -140,18 +140,15 @@ public class ComputersActivity extends AppCompatActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem aMenuItem) {
-        switch (aMenuItem.getItemId()) {
-            case R.id.menu_settings:
-                startActivity(Intents.buildSettingsIntent(this));
-                return true;
-
-            case R.id.menu_requirements:
-                startActivity(Intents.buildRequirementsIntent(this));
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(aMenuItem);
+        int itemId = aMenuItem.getItemId();
+        if (itemId == R.id.menu_settings) {
+            startActivity(Intents.buildSettingsIntent(this));
+            return true;
+        } else if (itemId == R.id.menu_requirements) {
+            startActivity(Intents.buildRequirementsIntent(this));
+            return true;
         }
+        return super.onOptionsItemSelected(aMenuItem);
     }
 
     private void toggleFab(int pos) {
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java
index 245bf24..dcd25f2 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java
@@ -477,49 +477,39 @@ public class SlideShowActivity extends AppCompatActivity implements ServiceConne
 
     @Override
     public boolean onOptionsItemSelected(MenuItem aMenuItem) {
-        switch (aMenuItem.getItemId()) {
-            case android.R.id.home:
-                navigateUp();
-                return true;
-
-            case R.id.menu_slides_grid:
-                changeMode(Mode.GRID);
-                return true;
-
-            case R.id.menu_slides_pager:
-            case R.id.menu_stop_pointer:
-                changeMode(Mode.PAGER);
-                return true;
-
-            case R.id.menu_timer:
-                callTimer();
-                return true;
-
-            case R.id.menu_resume_slide_show:
-                changeMode(Mode.PAGER);
-                setUpSlideShowInformation();
-                resumeSlideShow();
-                resumeTimer();
-                return true;
-
-            case R.id.menu_pause_slide_show:
-                changeMode(Mode.EMPTY);
-                setUpSlideShowPausedInformation();
-                pauseSlideShow();
-                pauseTimer();
-                return true;
-
-            case R.id.menu_stop_slide_show:
-                stopSlideShow();
-                return true;
-
-            case R.id.menu_start_pointer:
-                changeMode(Mode.STARTPOINTER);
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(aMenuItem);
+        int itemId = aMenuItem.getItemId();
+        if (itemId == android.R.id.home) {
+            navigateUp();
+            return true;
+        } else if (itemId == R.id.menu_slides_grid) {
+            changeMode(Mode.GRID);
+            return true;
+        } else if (itemId == R.id.menu_slides_pager || itemId == R.id.menu_stop_pointer) {
+            changeMode(Mode.PAGER);
+            return true;
+        } else if (itemId == R.id.menu_timer) {
+            callTimer();
+            return true;
+        } else if (itemId == R.id.menu_resume_slide_show) {
+            changeMode(Mode.PAGER);
+            setUpSlideShowInformation();
+            resumeSlideShow();
+            resumeTimer();
+            return true;
+        } else if (itemId == R.id.menu_pause_slide_show) {
+            changeMode(Mode.EMPTY);
+            setUpSlideShowPausedInformation();
+            pauseSlideShow();
+            pauseTimer();
+            return true;
+        } else if (itemId == R.id.menu_stop_slide_show) {
+            stopSlideShow();
+            return true;
+        } else if (itemId == R.id.menu_start_pointer) {
+            changeMode(Mode.STARTPOINTER);
+            return true;
         }
+        return super.onOptionsItemSelected(aMenuItem);
     }
 
     private void navigateUp() {
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
index 9864f50..4f1c6e5 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
@@ -291,16 +291,13 @@ public class ComputerConnectionFragment extends Fragment implements ServiceConne
 
     @Override
     public boolean onOptionsItemSelected(MenuItem aMenuItem) {
-        switch (aMenuItem.getItemId()) {
-            case R.id.menu_reconnect:
-                setCurrentView(R.id.progress_bar);
-                connectComputer();
-                refreshActionBarMenu();
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(aMenuItem);
+        if (aMenuItem.getItemId() == R.id.menu_reconnect) {
+            setCurrentView(R.id.progress_bar);
+            connectComputer();
+            refreshActionBarMenu();
+            return true;
         }
+        return super.onOptionsItemSelected(aMenuItem);
     }
 
     @Override
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java
index de7e52b..8a2b470 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java
@@ -319,14 +319,11 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
         int aComputerPosition = getListItemPosition(aMenuItem);
         Server aComputer = getComputersAdapter().getItem(aComputerPosition);
 
-        switch (aMenuItem.getItemId()) {
-            case R.id.menu_remove_computer:
-                removeComputer(aComputer);
-                return true;
-
-            default:
-                return super.onContextItemSelected(aMenuItem);
+        if (aMenuItem.getItemId() == R.id.menu_remove_computer) {
+            removeComputer(aComputer);
+            return true;
         }
+        return super.onContextItemSelected(aMenuItem);
     }
 
     private int getListItemPosition(android.view.MenuItem aMenuItem) {