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

Some improvements

This commit is contained in:
tom79 2017-09-05 19:04:19 +02:00
parent 7ef423abd8
commit 8c56dc0b2d
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java
View File

@ -35,7 +35,9 @@ import java.util.List;
import fr.gouv.etalab.mastodon.activities.MainActivity;
import fr.gouv.etalab.mastodon.client.APIResponse;
import fr.gouv.etalab.mastodon.client.Entities.Account;
import fr.gouv.etalab.mastodon.client.Entities.Status;
import fr.gouv.etalab.mastodon.drawers.NotificationsListAdapter;
import fr.gouv.etalab.mastodon.drawers.StatusListAdapter;
import fr.gouv.etalab.mastodon.helper.Helper;
import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
import fr.gouv.etalab.mastodon.sqlite.Sqlite;
@ -184,6 +186,31 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
}
@Override
public void onResume() {
super.onResume();
//New data are available
notificationsTmp = Helper.getTempNotification(context, null);
if (getUserVisibleHint() && notificationsTmp != null && notificationsTmp.size() > 0 && notifications.size() > 0) {
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean isOnWifi = Helper.isOnWIFI(context);
int behaviorWithAttachments = sharedpreferences.getInt(Helper.SET_ATTACHMENT_ACTION, Helper.ATTACHMENT_ALWAYS);
int positionSpinnerTrans = sharedpreferences.getInt(Helper.SET_TRANSLATOR, Helper.TRANS_YANDEX);
for(int i = notificationsTmp.size() -1 ; i >= 0 ; i--){
if( !this.notifications.contains(notificationsTmp.get(i)))
this.notifications.add(0,notificationsTmp.get(i));
}
if( this.notifications.size() > 0 )
max_id = this.notifications.get(this.notifications.size()-1).getId();
notificationsListAdapter = new NotificationsListAdapter(context,isOnWifi, behaviorWithAttachments, notifications);
lv_notifications.setAdapter(notificationsListAdapter);
notificationsTmp = new ArrayList<>();
Helper.cacheNotificationsClear(context, null);
}
}
@Override
public void onRetrieveNotifications(APIResponse apiResponse, String acct, String userId, boolean refreshData) {
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@ -256,6 +283,8 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
if( !this.notifications.contains(notificationsTmp.get(i)))
this.notifications.add(0,notificationsTmp.get(i));
}
if( this.notifications.size() > 0 )
max_id = this.notifications.get(this.notifications.size()-1).getId();
boolean isOnWifi = Helper.isOnWIFI(context);
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int behaviorWithAttachments = sharedpreferences.getInt(Helper.SET_ATTACHMENT_ACTION, Helper.ATTACHMENT_ALWAYS);

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

@ -259,18 +259,22 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
public void onResume() {
super.onResume();
//New data are available
if (getUserVisibleHint() && statusesTmp != null && statusesTmp.size() > 0 ) {
statusesTmp = Helper.getTempStatus(context, null);
if (getUserVisibleHint() && statusesTmp != null && statusesTmp.size() > 0 && statuses.size() > 0) {
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean isOnWifi = Helper.isOnWIFI(context);
int behaviorWithAttachments = sharedpreferences.getInt(Helper.SET_ATTACHMENT_ACTION, Helper.ATTACHMENT_ALWAYS);
int positionSpinnerTrans = sharedpreferences.getInt(Helper.SET_TRANSLATOR, Helper.TRANS_YANDEX);
statuses = new ArrayList<>();
for(Status status: statusesTmp){
statuses.add(status);
for(int i = statusesTmp.size() -1 ; i >= 0 ; i--){
if( !this.statuses.contains(statusesTmp.get(i)))
this.statuses.add(0,statusesTmp.get(i));
}
if( this.statuses.size() > 0 )
max_id = this.statuses.get(this.statuses.size()-1).getId();
statusListAdapter = new StatusListAdapter(context, type, targetedId, isOnWifi, behaviorWithAttachments, positionSpinnerTrans, statuses);
lv_status.setAdapter(statusListAdapter);
statusesTmp = new ArrayList<>();
Helper.cacheStatusClear(context, null);
}
}
@ -365,6 +369,8 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
if( !this.statuses.contains(statusesTmp.get(i)))
this.statuses.add(0,statusesTmp.get(i));
}
if( this.statuses.size() > 0 )
max_id = this.statuses.get(this.statuses.size()-1).getId();
boolean isOnWifi = Helper.isOnWIFI(context);
final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int behaviorWithAttachments = sharedpreferences.getInt(Helper.SET_ATTACHMENT_ACTION, Helper.ATTACHMENT_ALWAYS);