diff options
| -rw-r--r-- | app/src/main/java/com/wireguard/android/model/Tunnel.java | 12 | ||||
| -rw-r--r-- | app/src/main/res/layout/tunnel_detail_fragment.xml | 56 |
2 files changed, 11 insertions, 57 deletions
diff --git a/app/src/main/java/com/wireguard/android/model/Tunnel.java b/app/src/main/java/com/wireguard/android/model/Tunnel.java index 25bb46df..8152381b 100644 --- a/app/src/main/java/com/wireguard/android/model/Tunnel.java +++ b/app/src/main/java/com/wireguard/android/model/Tunnel.java @@ -12,8 +12,6 @@ import com.wireguard.android.util.ExceptionLoggers; import com.wireguard.android.util.Keyed; import com.wireguard.config.Config; -import org.threeten.bp.Instant; - import java.util.Objects; import java.util.regex.Pattern; @@ -33,7 +31,6 @@ public class Tunnel extends BaseObservable implements Keyed<String> { private final ConfigStore configStore; private final String name; private Config config; - private Instant lastStateChange = Instant.EPOCH; private State state = State.UNKNOWN; private Statistics statistics; @@ -68,11 +65,6 @@ public class Tunnel extends BaseObservable implements Keyed<String> { } @Bindable - public Instant getLastStateChange() { - return lastStateChange; - } - - @Bindable public String getName() { return name; } @@ -106,10 +98,6 @@ public class Tunnel extends BaseObservable implements Keyed<String> { } private void onStateChanged(final State oldState, final State newState) { - if (oldState != State.UNKNOWN) { - lastStateChange = Instant.now(); - notifyPropertyChanged(BR.lastStateChange); - } if (newState != State.UP) setStatisticsInternal(null); } diff --git a/app/src/main/res/layout/tunnel_detail_fragment.xml b/app/src/main/res/layout/tunnel_detail_fragment.xml index e23536a7..5a30e8dd 100644 --- a/app/src/main/res/layout/tunnel_detail_fragment.xml +++ b/app/src/main/res/layout/tunnel_detail_fragment.xml @@ -38,79 +38,45 @@ <TextView android:id="@+id/interface_title" style="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:text="@string/iface" /> - - <TextView - android:id="@+id/interface_name_label" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/interface_title" - android:layout_marginTop="8dp" - android:labelFor="@+id/interface_name_text" - android:text="@string/name" /> - - <TextView - android:id="@+id/interface_name_text" - style="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/interface_name_label" - android:text="@{tunnel.name}" /> - - <TextView - android:id="@+id/status_label" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/interface_name_text" - android:layout_marginTop="8dp" - android:labelFor="@+id/status_text" - android:text="@string/status" /> - - <TextView - android:id="@+id/status_text" - style="?android:attr/textAppearanceMedium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:layout_below="@+id/status_label" + android:layout_alignParentTop="true" android:layout_toStartOf="@+id/tunnel_switch" - android:text="@{tunnel.state.name}" /> + android:text="@string/iface" /> <com.wireguard.android.widget.ToggleSwitch android:id="@+id/tunnel_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/status_text" + android:layout_alignBaseline="@+id/interface_title" android:layout_alignParentEnd="true" android:enabled="@{tunnel.state != State.UNKNOWN}" app:checked="@{tunnel.state == State.UP}" app:onBeforeCheckedChanged="@{() -> tunnel.setState(State.TOGGLE)}" /> <TextView - android:id="@+id/last_change_label" + android:id="@+id/interface_name_label" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/status_text" + android:layout_below="@+id/interface_title" android:layout_marginTop="8dp" - android:labelFor="@+id/last_change_text" - android:text="@string/last_change" /> + android:labelFor="@+id/interface_name_text" + android:text="@string/name" /> <TextView - android:id="@+id/last_change_text" + android:id="@+id/interface_name_text" style="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@+id/last_change_label" - android:text="@{tunnel.lastStateChange}" /> + android:layout_below="@+id/interface_name_label" + android:text="@{tunnel.name}" /> <TextView android:id="@+id/public_key_label" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/last_change_text" + android:layout_below="@id/interface_name_text" android:layout_marginTop="8dp" android:labelFor="@+id/public_key_text" android:text="@string/public_key" /> |