|
|
@ -32,7 +32,6 @@ public class NetworkSettingsCommand { |
|
|
|
private String urlRedirectCustomUrl; |
|
|
|
private String urlRedirectCustomUrl; |
|
|
|
private String urlRedirectType; |
|
|
|
private String urlRedirectType; |
|
|
|
private int port; |
|
|
|
private int port; |
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
private boolean toast; |
|
|
|
private boolean toast; |
|
|
|
|
|
|
|
|
|
|
|
public void setPortForwardingEnabled(boolean portForwardingEnabled) { |
|
|
|
public void setPortForwardingEnabled(boolean portForwardingEnabled) { |
|
|
@ -74,7 +73,6 @@ public class NetworkSettingsCommand { |
|
|
|
this.port = port; |
|
|
|
this.port = port; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
public boolean isToast() { |
|
|
|
public boolean isToast() { |
|
|
|
return toast; |
|
|
|
return toast; |
|
|
|
} |
|
|
|
} |
|
|
@ -83,8 +81,6 @@ public class NetworkSettingsCommand { |
|
|
|
this.toast = toast; |
|
|
|
this.toast = toast; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public String getUrlRedirectType() { |
|
|
|
public String getUrlRedirectType() { |
|
|
|
return urlRedirectType; |
|
|
|
return urlRedirectType; |
|
|
|
} |
|
|
|
} |
|
|
|