diff options
Diffstat (limited to 'app/src/main/java/app/fedilab/android/services/StreamingLocalTimelineService.java')
-rw-r--r-- | app/src/main/java/app/fedilab/android/services/StreamingLocalTimelineService.java | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/app/src/main/java/app/fedilab/android/services/StreamingLocalTimelineService.java b/app/src/main/java/app/fedilab/android/services/StreamingLocalTimelineService.java index 4cd1be065..ae9a2f7ea 100644 --- a/app/src/main/java/app/fedilab/android/services/StreamingLocalTimelineService.java +++ b/app/src/main/java/app/fedilab/android/services/StreamingLocalTimelineService.java @@ -29,7 +29,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.koushikdutta.async.http.AsyncHttpClient; import com.koushikdutta.async.http.AsyncHttpRequest; import com.koushikdutta.async.http.Headers; -import com.koushikdutta.async.http.WebSocket; import org.json.JSONException; import org.json.JSONObject; @@ -37,8 +36,6 @@ import org.json.JSONObject; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; -import javax.net.ssl.HttpsURLConnection; - import app.fedilab.android.client.API; import app.fedilab.android.client.Entities.Account; import app.fedilab.android.client.Entities.Status; @@ -55,7 +52,6 @@ import app.fedilab.android.sqlite.Sqlite; public class StreamingLocalTimelineService extends IntentService { - private static HttpsURLConnection httpsURLConnection; static { Helper.installProvider(); @@ -117,33 +113,26 @@ public class StreamingLocalTimelineService extends IntentService { try { AsyncHttpClient.getDefaultInstance().getSSLSocketMiddleware().setSSLContext(new TLSSocketFactory(accountStream.getInstance()).getSSLContext()); AsyncHttpClient.getDefaultInstance().getSSLSocketMiddleware().setConnectAllAddresses(true); - } catch (KeyManagementException e) { - e.printStackTrace(); - } catch (NoSuchAlgorithmException e) { + } catch (KeyManagementException | NoSuchAlgorithmException e) { e.printStackTrace(); } } - AsyncHttpClient.getDefaultInstance().websocket("wss://" + accountStream.getInstance() + "/api/v1/streaming/?stream=public:local&access_token=" + accountStream.getToken(), "wss", new AsyncHttpClient.WebSocketConnectCallback() { - @Override - public void onCompleted(Exception ex, WebSocket webSocket) { - if (ex != null) { - ex.printStackTrace(); + AsyncHttpClient.getDefaultInstance().websocket("wss://" + accountStream.getInstance() + "/api/v1/streaming/?stream=public:local&access_token=" + accountStream.getToken(), "wss", (ex, webSocket) -> { + if (ex != null) { + ex.printStackTrace(); + return; + } + webSocket.setStringCallback(s -> { + if (!sharedpreferences.getBoolean(Helper.SHOULD_CONTINUE_STREAMING_LOCAL + finalAccountStream.getId() + finalAccountStream.getInstance(), true)) { + stopSelf(); return; } - webSocket.setStringCallback(new WebSocket.StringCallback() { - public void onStringAvailable(String s) { - if (!sharedpreferences.getBoolean(Helper.SHOULD_CONTINUE_STREAMING_LOCAL + finalAccountStream.getId() + finalAccountStream.getInstance(), true)) { - stopSelf(); - return; - } - try { - JSONObject eventJson = new JSONObject(s); - onRetrieveStreaming(finalAccountStream, eventJson); - } catch (JSONException ignored) { - } - } - }); - } + try { + JSONObject eventJson = new JSONObject(s); + onRetrieveStreaming(finalAccountStream, eventJson); + } catch (JSONException ignored) { + } + }); }); } } |