Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced if/else with switch in ErrorActivity #6109

Merged
merged 2 commits into from
Apr 19, 2021
Merged

Replaced if/else with switch in ErrorActivity #6109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc4dd45
Replaced if/else with switch
sauravrao637 Apr 19, 2021
57f1152
suppress false warning (which affect only library projects)
sauravrao637 Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
17 changes: 9 additions & 8 deletions app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down