frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

ToolsInstaller: Propagate NoRootException properly

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland
2018-01-09 08:13:32 -06:00
parent 52e8eef9ce
commit 426fa7d50b
2 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java
+20 -14
View File
@@ -34,15 +34,6 @@ public class ToolsInstallerPreference extends Preference {
this(context, null);
}
private static State mapResultToState(final int scriptResult) {
if (scriptResult == OsConstants.EXIT_SUCCESS)
return State.SUCCESS;
else if (scriptResult == OsConstants.EALREADY)
return State.ALREADY;
else
return State.FAILURE;
}
@Override
public CharSequence getSummary() {
return getContext().getString(state.messageResourceId);
@@ -61,16 +52,31 @@ public class ToolsInstallerPreference extends Preference {
@Override
protected void onAttachedToActivity() {
super.onAttachedToActivity();
asyncWorker.supplyAsync(toolsInstaller::areInstalled)
.thenAccept(installed -> setState(installed ? State.ALREADY : State.INITIAL));
asyncWorker.supplyAsync(toolsInstaller::areInstalled).whenComplete(this::onCheckResult);
}
private void onCheckResult(final Integer result, final Throwable throwable) {
setState(throwable == null && result == OsConstants.EALREADY ?
State.ALREADY : State.INITIAL);
}
@Override
protected void onClick() {
setState(State.WORKING);
asyncWorker.supplyAsync(toolsInstaller::install)
.thenApply(ToolsInstallerPreference::mapResultToState)
.thenAccept(this::setState);
asyncWorker.supplyAsync(toolsInstaller::install).whenComplete(this::onInstallResult);
}
private void onInstallResult(final Integer result, final Throwable throwable) {
final State nextState;
if (throwable != null)
nextState = State.FAILURE;
else if (result == OsConstants.EXIT_SUCCESS)
nextState = State.SUCCESS;
else if (result == OsConstants.EALREADY)
nextState = State.ALREADY;
else
nextState = State.FAILURE;
setState(nextState);
}
private void setState(@NonNull final State state) {