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

Improves service + fixes counter issues

This commit is contained in:
stom79 2018-01-04 15:29:23 +01:00
parent c3a27da8b9
commit 8b017c68b8
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
View File

@ -368,7 +368,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
if (type == RetrieveFeedsAsyncTask.Type.HOME) {
//Makes sure the status is not already displayed
if( lastReadStatus == null || Long.parseLong(status.getId()) > Long.parseLong(lastReadStatus)) {
if( !statuses.contains(status)){
//Update the id of the last toot retrieved
MainActivity.lastHomeId = status.getId();
status.setReplies(new ArrayList<Status>());
@ -380,6 +380,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
textviewNoAction.setVisibility(View.GONE);
}
} else if (type == RetrieveFeedsAsyncTask.Type.PUBLIC || type == RetrieveFeedsAsyncTask.Type.LOCAL) {
status.setReplies(new ArrayList<Status>());

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

@ -28,7 +28,6 @@ import android.os.Looper;
import android.os.SystemClock;
import android.support.annotation.Nullable;
import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource;
@ -86,7 +85,6 @@ public class LiveNotificationService extends Service {
private static HashMap<String, Boolean> isRunning = new HashMap<>();
public void onCreate() {
super.onCreate();
Log.v(Helper.TAG,"onCreate= ");
}
@ -94,7 +92,6 @@ public class LiveNotificationService extends Service {
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
Log.v(Helper.TAG,"onStartCommand= " + intent);
if( intent == null || intent.getBooleanExtra("stop", false) ) {
stop = true;
stopSelf();
@ -161,7 +158,6 @@ public class LiveNotificationService extends Service {
if( account != null){
isRunning.get(account.getAcct()+account.getInstance());
Log.v(Helper.TAG, account.getAcct() + "@" + account.getInstance() + " RUN -> " + isRunning.get(account.getAcct()+account.getInstance()));
if(!isRunning.containsKey(account.getAcct()+account.getInstance()) || ! isRunning.get(account.getAcct()+account.getInstance())) {
try {
URL url = new URL("https://" + account.getInstance() + "/api/v1/streaming/user");
@ -180,7 +176,6 @@ public class LiveNotificationService extends Service {
Helper.EventStreaming eventStreaming;
while ((event = reader.readLine()) != null) {
isRunning.put(account.getAcct()+account.getInstance(), true);
Log.v(Helper.TAG, account.getAcct() + "@" + account.getInstance() + " -> " + event + " -- " + reader);
if ((lastEvent == Helper.EventStreaming.NONE || lastEvent == null) && !event.startsWith("data: ")) {
switch (event.trim()) {
case "event: update":
@ -215,7 +210,7 @@ public class LiveNotificationService extends Service {
try {
JSONObject eventJson = new JSONObject(event);
onRetrieveStreaming(eventStreaming, account, eventJson);
} catch (JSONException ignored) {
} catch (JSONException ignored) { ignored.printStackTrace();
}
}
}
@ -225,7 +220,6 @@ public class LiveNotificationService extends Service {
} catch (Exception ignored) {
isRunning.put(account.getAcct() + account.getInstance(), false);
ignored.printStackTrace();
Log.v(Helper.TAG, account.getAcct() + "@" + account.getInstance() + " -> " + ignored.getMessage());
} finally {
if (reader != null) {
try {