Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ToggleSwitch: Improve reliability

Browse Source 
It's not great, but it's better than it was.

Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2018-01-08 03:38:44 -06:00
parent 668d90f063
commit b6ed17884f
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/wireguard/android/model/TunnelManager.java
View File

@ -237,9 +237,10 @@ public final class TunnelManager extends BaseObservable {
CompletionStage<State> setTunnelState(final Tunnel tunnel, final State state) {
final CompletionStage<State> completion =
asyncWorker.supplyAsync(() -> backend.setState(tunnel, state));
completion.thenAccept(tunnel::onStateChanged);
completion.thenAccept(newState -> {
if (newState == State.UP)
completion.whenComplete((newState, e) -> {
// Ensure onStateChanged is always called (failure or not), and with the correct state.
tunnel.onStateChanged(e == null ? newState : tunnel.getState());
if (e == null && newState == State.UP)
setLastUsedTunnel(tunnel);
});
return completion;

25
app/src/main/java/com/wireguard/android/widget/ToggleSwitch.java
View File

@ -22,25 +22,15 @@ import android.util.AttributeSet;
import android.widget.Switch;
public class ToggleSwitch extends Switch {
private boolean hasPendingStateChange;
private boolean isRestoringState;
private OnBeforeCheckedChangeListener listener;
public ToggleSwitch(final Context context) {
super(context);
}
public ToggleSwitch(final Context context, final AttributeSet attrs) {
super(context, attrs);
}
public ToggleSwitch(final Context context, final AttributeSet attrs, final int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
public ToggleSwitch(final Context context, final AttributeSet attrs, final int defStyleAttr,
final int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
public ToggleSwitch(final Context context) {
this(context, null);
}
@Override
@ -48,28 +38,23 @@ public class ToggleSwitch extends Switch {
isRestoringState = true;
super.onRestoreInstanceState(state);
isRestoringState = false;
}
@Override
public void setChecked(final boolean checked) {
if (checked == isChecked())
return;
if (isRestoringState || listener == null) {
super.setChecked(checked);
return;
}
if (hasPendingStateChange)
return;
hasPendingStateChange = true;
setEnabled(false);
listener.onBeforeCheckedChanged(this, checked);
}
public void setCheckedInternal(final boolean checked) {
if (hasPendingStateChange) {
setEnabled(true);
hasPendingStateChange = false;
}
super.setChecked(checked);
setEnabled(true);
}
public void setOnBeforeCheckedChangeListener(final OnBeforeCheckedChangeListener listener) {