Merge pull request #6109 from sauravrao637/codeImrovement

Replaced if/else with switch in ErrorActivity, supress false lint warning

Author: Redirion

app/build.gradle

@@ -66,6 +66,9 @@ android {
         // Or, if you prefer, you can continue to check for errors in release builds,
         // but continue the build even when errors are found:
         abortOnError false
+        // suppress false warning ("Resource IDs will be non-final in Android Gradle Plugin version
+        // 5.0, avoid using them in switch case statements"), which affects only library projects
+        disable 'NonConstantResourceId'
     }
 
     compileOptions {

app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java

@@ -190,15 +190,16 @@ public boolean onCreateOptionsMenu(final Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
-        final int id = item.getItemId();
-        if (id == android.R.id.home) {
-            onBackPressed();
-        } else if (id == R.id.menu_item_share_error) {
-            ShareUtils.shareText(this, getString(R.string.error_report_title), buildJson());
-        } else {
-            return false;
+        switch (item.getItemId()) {
+            case R.id.home:
+                onBackPressed();
+                return true;
+            case R.id.menu_item_share_error:
+                ShareUtils.shareText(this, getString(R.string.error_report_title), buildJson());
+                return true;
+            default:
+                return false;
         }
-        return true;
     }
 
     private void openPrivacyPolicyDialog(final Context context, final String action) {