Merge branch 'test_logs' into develop

This commit is contained in:
stom79 2018-12-19 08:41:21 +01:00
commit 054e991045
1 changed files with 2 additions and 2 deletions

View File

@ -210,6 +210,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece
webSocketFutures.put(account.getAcct()+"@"+account.getInstance(), webSocket); webSocketFutures.put(account.getAcct()+"@"+account.getInstance(), webSocket);
if (ex != null) { if (ex != null) {
ex.printStackTrace(); ex.printStackTrace();
startStream();
return; return;
} }
webSocket.setStringCallback(new WebSocket.StringCallback() { webSocket.setStringCallback(new WebSocket.StringCallback() {
@ -400,8 +401,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece
try { try {
dataId = response.getString("id"); dataId = response.getString("id");
b.putString("dataId", dataId); b.putString("dataId", dataId);
} catch (JSONException ignored) { } catch (JSONException ignored) { }
}
break; break;
} }
} catch (Exception e) { } catch (Exception e) {