diff --git a/app/build.gradle b/app/build.gradle index 6cafa5c6e..f396b2861 100644 --- a/app/build.gradle +++ b/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 { diff --git a/app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java index 2fcba0e1a..1bcd28d2e 100644 --- a/app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java +++ b/app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java @@ -190,15 +190,16 @@ public class ErrorActivity extends AppCompatActivity { @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) {