1
0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-23 16:40:32 +00:00

Merge pull request #6109 from sauravrao637/codeImrovement

Replaced if/else with switch in ErrorActivity, supress false lint warning
This commit is contained in:
Robin 2021-04-19 16:45:45 +02:00 committed by GitHub
commit 0039312a64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions

View File

@ -66,6 +66,9 @@ android {
// Or, if you prefer, you can continue to check for errors in release builds, // Or, if you prefer, you can continue to check for errors in release builds,
// but continue the build even when errors are found: // but continue the build even when errors are found:
abortOnError false 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 { compileOptions {

View File

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