Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes an issue with services

This commit is contained in:
stom79 2017-11-29 18:26:32 +01:00
parent 3f71a78c2e
commit 4dc40d3ee4
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -50,7 +50,7 @@
<receiver android:name=".services.RestartLiveNotificationReceiver" <receiver android:name=".services.RestartLiveNotificationReceiver"
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>
<action android:name="RestartStreamingService" /> <action android:name="RestartLiveNotificationService" />
<action android:name="android.intent.action.BOOT_COMPLETED" /> <action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter> </intent-filter>
</receiver> </receiver>

6
app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java
View File

@ -208,7 +208,7 @@ public class LiveNotificationService extends Service {
if( !restartCalled ) { if( !restartCalled ) {
restartCalled = true; restartCalled = true;
SystemClock.sleep(60000); SystemClock.sleep(60000);
sendBroadcast(new Intent("RestartStreamingService")); sendBroadcast(new Intent("RestartLiveNotificationService"));
stopSelf(); stopSelf();
} }
} }
@ -230,8 +230,8 @@ public class LiveNotificationService extends Service {
httpsURLConnection.disconnect(); httpsURLConnection.disconnect();
if( !restartCalled ) { if( !restartCalled ) {
restartCalled = true; restartCalled = true;
SystemClock.sleep(10000); SystemClock.sleep(5000);
sendBroadcast(new Intent("RestartStreamingService")); sendBroadcast(new Intent("RestartLiveNotificationService"));
stopSelf(); stopSelf();
} }
} }

3
app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingFederatedTimelineService.java
View File

@ -109,7 +109,8 @@ public class StreamingFederatedTimelineService extends IntentService {
httpsURLConnection.setRequestProperty("Connection", "Keep-Alive"); httpsURLConnection.setRequestProperty("Connection", "Keep-Alive");
httpsURLConnection.setRequestProperty("Keep-Alive", "header"); httpsURLConnection.setRequestProperty("Keep-Alive", "header");
httpsURLConnection.setRequestProperty("Connection", "close"); httpsURLConnection.setRequestProperty("Connection", "close");
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory()); if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP)
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
httpsURLConnection.setRequestMethod("GET"); httpsURLConnection.setRequestMethod("GET");
httpsURLConnection.setConnectTimeout(70000); httpsURLConnection.setConnectTimeout(70000);
httpsURLConnection.setReadTimeout(70000); httpsURLConnection.setReadTimeout(70000);

3
app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingLocalTimelineService.java
View File

@ -108,7 +108,8 @@ public class StreamingLocalTimelineService extends IntentService {
httpsURLConnection.setRequestProperty("Connection", "Keep-Alive"); httpsURLConnection.setRequestProperty("Connection", "Keep-Alive");
httpsURLConnection.setRequestProperty("Keep-Alive", "header"); httpsURLConnection.setRequestProperty("Keep-Alive", "header");
httpsURLConnection.setRequestProperty("Connection", "close"); httpsURLConnection.setRequestProperty("Connection", "close");
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory()); if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP)
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
httpsURLConnection.setRequestMethod("GET"); httpsURLConnection.setRequestMethod("GET");
httpsURLConnection.setConnectTimeout(70000); httpsURLConnection.setConnectTimeout(70000);
httpsURLConnection.setReadTimeout(70000); httpsURLConnection.setReadTimeout(70000);

3
app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingService.java
View File

@ -106,7 +106,8 @@ public class StreamingService extends IntentService {
httpsURLConnection.setRequestProperty("Connection", "Keep-Alive"); httpsURLConnection.setRequestProperty("Connection", "Keep-Alive");
httpsURLConnection.setRequestProperty("Keep-Alive", "header"); httpsURLConnection.setRequestProperty("Keep-Alive", "header");
httpsURLConnection.setRequestProperty("Connection", "close"); httpsURLConnection.setRequestProperty("Connection", "close");
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory()); if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP)
httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory());
httpsURLConnection.setRequestMethod("GET"); httpsURLConnection.setRequestMethod("GET");
httpsURLConnection.setConnectTimeout(70000); httpsURLConnection.setConnectTimeout(70000);
httpsURLConnection.setReadTimeout(70000); httpsURLConnection.setReadTimeout(70000);