Skip to content

Commit a2b591c

Browse files
Version 1.0.1.96
What's new: - Bugfix in recordings Signed-off-by: developerfromjokela <[email protected]>
1 parent 4a0f2dc commit a2b591c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apply plugin: 'com.android.application'
88
def versionMajor = 1
99
def versionMinor = 0
1010
def versionPatch = 1
11-
def versionBuild = 95 // 0-50=Alpha / 51-98=RC / 90-99=stable
11+
def versionBuild = 96 // 0-50=Alpha / 51-98=RC / 90-99=stable
1212
android {
1313
compileSdkVersion 30
1414
defaultConfig {

app/src/main/java/com/developerfromjokela/motioneyeclient/classes/Device.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.net.wifi.WifiConfiguration;
99

1010
import com.developerfromjokela.motioneyeclient.ui.utils.URLUtils;
11+
import com.google.gson.Gson;
1112

1213
import java.io.Serializable;
1314
import java.net.Inet4Address;
@@ -26,7 +27,7 @@ public class Device implements Serializable {
2627
private String motionVersion = "";
2728
private String osVersion = "";
2829
private ArrayList<Camera> cameras = new ArrayList<>();
29-
private WifiConfiguration wlan;
30+
private String wlan;
3031

3132

3233
public Device(String ID, String deviceName, String deviceUrl, String ddnsURL, String localPort, String DDNSPort, CameraUser user, String motioneyeVersion, String motionVersion, String osVersion, ArrayList<Camera> cameras, WifiConfiguration wlan) {
@@ -41,7 +42,7 @@ public Device(String ID, String deviceName, String deviceUrl, String ddnsURL, St
4142
this.motionVersion = motionVersion;
4243
this.osVersion = osVersion;
4344
this.cameras = cameras;
44-
this.wlan = wlan;
45+
this.wlan = new Gson().toJson(wlan);
4546
}
4647

4748
public String getDeviceUrlCombo() {
@@ -132,7 +133,7 @@ public String getID() {
132133
}
133134

134135
public WifiConfiguration getWlan() {
135-
return wlan;
136+
return new Gson().fromJson(this.wlan, WifiConfiguration.class);
136137
}
137138

138139
public String getPort() {
@@ -148,7 +149,7 @@ public void setPort(String port) {
148149
}
149150

150151
public void setWlan(WifiConfiguration wlan) {
151-
this.wlan = wlan;
152+
this.wlan = new Gson().toJson(wlan);
152153
}
153154

154155
public String getDeviceName() {

0 commit comments

Comments
 (0)