summaryrefslogtreecommitdiffstats
path: root/app/src
diff options
context:
space:
mode:
authorstom79 <tschneider.ac@gmail.com>2018-11-21 16:57:21 +0100
committerstom79 <tschneider.ac@gmail.com>2018-11-21 16:57:21 +0100
commitd1a23b6642c77f9a20fb9c23b46b269e3d616456 (patch)
treede401fc0b37e9532c3a725382b1d18b99cb00aef /app/src
parentad0d5d9f41a88ae3a8fecc7e307e1e7cb29b5947 (diff)
Improve offline detection
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
index 452de5940..df74bfcd7 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
@@ -97,7 +97,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
private String instanceType;
private String search_peertube, remote_channel_name;
private String bookmark;
- private boolean isConnectedToInternet;
public DisplayStatusFragment(){
}
@@ -114,7 +113,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
firstTootsLoaded = true;
showPinned = false;
showReply = false;
- isConnectedToInternet = true;
if (bundle != null) {
type = (RetrieveFeedsAsyncTask.Type) bundle.get("type");
targetedId = bundle.getString("targetedId", null);
@@ -197,8 +195,11 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
else
asyncTask = new RetrievePeertubeSearchAsyncTask(context, remoteInstance, search_peertube, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}else{
- if( type == RetrieveFeedsAsyncTask.Type.HOME && !isConnectedToInternet){
- asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ if( type == RetrieveFeedsAsyncTask.Type.HOME){
+ if( Helper.isConnectedToInternet(context, Helper.getLiveInstance(context)))
+ asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ else
+ asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, true,DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}else {
asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
@@ -582,7 +583,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
retrieveMissingToots(statuses.get(0).getId());
}
}else if (type == RetrieveFeedsAsyncTask.Type.HOME){
- isConnectedToInternet = Helper.isConnectedToInternet(context, Helper.getLiveInstance(context));
statusListAdapter.updateMuted(mutedAccount);
if( statuses != null && statuses.size() > 0)
retrieveMissingToots(statuses.get(0).getId());