From c0a13ad65fb77eda9c6f3cbbe218f175a24dae75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 11 Sep 2015 17:29:58 -0700 Subject: [PATCH] Some Java 1.7 string switch goodness --- .../InstallPrivilegedDialogActivity.java | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallPrivilegedDialogActivity.java b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallPrivilegedDialogActivity.java index 02a5f4d9f..a4f514ffc 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallPrivilegedDialogActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallPrivilegedDialogActivity.java @@ -76,15 +76,19 @@ public class InstallPrivilegedDialogActivity extends FragmentActivity { apkFile = getIntent().getStringExtra(EXTRA_INSTALL_APK); - action = getIntent().getAction(); - if (ACTION_UNINSTALL.equals(action)) { - uninstall(); - } else if (ACTION_INSTALL.equals(action)) { - checkRootTask.execute(); - } else if (ACTION_FIRST_TIME.equals(action)) { - checkRootTask.execute(); - } else if (ACTION_POST_INSTALL.equals(action)) { - postInstall(); + switch (getIntent().getAction()) { + case ACTION_UNINSTALL: + uninstall(); + break; + case ACTION_INSTALL: + checkRootTask.execute(); + break; + case ACTION_FIRST_TIME: + checkRootTask.execute(); + break; + case ACTION_POST_INSTALL: + postInstall(); + break; } } @@ -224,12 +228,16 @@ public class InstallPrivilegedDialogActivity extends FragmentActivity { if (rootGranted) { // root access granted - if (ACTION_UNINSTALL.equals(action)) { - uninstallTask.execute(); - } else if (ACTION_INSTALL.equals(action)) { - installTask.execute(); - } else if (ACTION_FIRST_TIME.equals(action)) { - firstTime(); + switch (action) { + case ACTION_UNINSTALL: + uninstallTask.execute(); + break; + case ACTION_INSTALL: + installTask.execute(); + break; + case ACTION_FIRST_TIME: + firstTime(); + break; } } else { // root access denied