kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate gotify to new client

Browse Source
This commit is contained in:
Jannis Mattheis
2018-11-14 19:39:22 +01:00
parent 3a9da353b4
commit d4c6273214
13 changed files with 209 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/github/gotify/service/WebSocketConnection.java
View File

@@ -5,7 +5,6 @@ import com.github.gotify.SSLSettings;
import com.github.gotify.Utils;
import com.github.gotify.api.Callback;
import com.github.gotify.api.CertUtils;
import com.github.gotify.client.JSON;
import com.github.gotify.client.model.Message;
import com.github.gotify.log.Log;
import java.util.concurrent.TimeUnit;
@@ -18,7 +17,6 @@ import okhttp3.WebSocketListener;
public class WebSocketConnection {
private OkHttpClient client;
private static final JSON gson = Utils.json();
private final Handler handler = new Handler();
private int errorCount = 0;
@@ -125,7 +123,7 @@ public class WebSocketConnection {
public void onMessage(WebSocket webSocket, String text) {
Log.i("WebSocket: received message " + text);
synchronized (this) {
Message message = gson.deserialize(text, Message.class);
Message message = Utils.JSON.fromJson(text, Message.class);
onMessage.onSuccess(message);
}
super.onMessage(webSocket, text);

6
app/src/main/java/com/github/gotify/service/WebSocketService.java
View File

@@ -19,6 +19,7 @@ import com.github.gotify.R;
import com.github.gotify.Settings;
import com.github.gotify.Utils;
import com.github.gotify.api.ClientFactory;
import com.github.gotify.client.api.MessageApi;
import com.github.gotify.client.model.Message;
import com.github.gotify.log.Log;
import com.github.gotify.log.UncaughtExceptionHandler;
@@ -46,7 +47,8 @@ public class WebSocketService extends Service {
missingMessageUtil =
new MissedMessageUtil(
ClientFactory.clientToken(
settings.url(), settings.sslSettings(), settings.token()));
settings.url(), settings.sslSettings(), settings.token())
.createService(MessageApi.class));
Log.i("Create " + getClass().getSimpleName());
}
@@ -147,7 +149,7 @@ public class WebSocketService extends Service {
private void broadcast(Message message) {
Intent intent = new Intent();
intent.setAction(NEW_MESSAGE_BROADCAST);
intent.putExtra("message", Utils.json().serialize(message));
intent.putExtra("message", Utils.JSON.toJson(message));
sendBroadcast(intent);
}