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

Remove items

This commit is contained in:
tom79 2019-05-09 19:03:02 +02:00
parent aa7d4ab054
commit 93a08fcb4f
3 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
View File

@ -42,6 +42,7 @@ import android.support.v4.app.ActivityCompat;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.GravityCompat;
import android.support.v4.view.ViewPager;
@ -52,6 +53,7 @@ import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.SwitchCompat;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.util.Patterns;
import android.view.Gravity;
import android.view.LayoutInflater;
@ -85,10 +87,13 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import es.dmoral.toasty.Toasty;
@ -1343,26 +1348,46 @@ public abstract class BaseMainActivity extends BaseActivity
public void onResume(){
super.onResume();
PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean("isMainActivityRunning", true).apply();
// updateNotifCounter();
// updateHomeCounter();
//Proceeds to update of the authenticated account
if(Helper.isLoggedIn(getApplicationContext())) {
new UpdateAccountInfoByIDAsyncTask(getApplicationContext(), social, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
/*if( lastHomeId != null && homeFragment != null){
homeFragment.retrieveMissingToots(lastHomeId);
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
String datestr = sharedpreferences.getString(Helper.HOME_LAST_READ + userId + instance,null);
if( timelines != null && timelines.size() > 0 && mPageReferenceMap != null && datestr != null){
Date date = Helper.stringToDate(getApplicationContext(), datestr);
Date dateAllowed = new Date( System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(15));
//Refresh home if needed
Log.v(Helper.TAG,"date: " + date);
Log.v(Helper.TAG,"dateAllowed: " + dateAllowed);
Log.v(Helper.TAG,"dateAllowed.after(date): " + dateAllowed.after(date));
if( dateAllowed.after(date) || 1 == 1) {
for (ManageTimelines tl : timelines) {
if (tl.getType() == ManageTimelines.Type.HOME && mPageReferenceMap.containsKey(tl.getPosition())) {
DisplayStatusFragment homeTimeline = (DisplayStatusFragment) mPageReferenceMap.get(tl.getPosition());
if (homeTimeline != null) {
homeTimeline.retrieveMissingHome();
}
break;
}
}
}
}
if( lastNotificationId != null && tabLayoutNotificationsFragment != null){
tabLayoutNotificationsFragment.retrieveMissingNotifications(lastNotificationId);
}*/
}
@Override
protected void onPause() {
super.onPause();
if( userId != null && instance != null) {
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.HOME_LAST_READ + userId + instance, Helper.dateToString(new Date()));
editor.apply();
}
PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean("isMainActivityRunning", false).apply();
}

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

@ -32,6 +32,7 @@ import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -711,6 +712,27 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
}
public void retrieveMissingHome(){
if( statusListAdapter != null && statuses != null && lv_status != null && mLayoutManager != null){
int firstVisible = mLayoutManager.findFirstVisibleItemPosition();
Iterator<Status> s = statuses.iterator();
int i = 0;
Log.v(Helper.TAG,"firstVisible: " + firstVisible);
Log.v(Helper.TAG,"statuses: " + statuses.size());
while (s.hasNext() && i < firstVisible) {
Status status = s.next();
Log.v(Helper.TAG,status.getAccount().getAcct() + " - " + status.getCreated_at() );
s.remove();
statusListAdapter.notifyItemRemoved(0);
statusListAdapter.notifyItemChanged(0);
i++;
}
Log.v(Helper.TAG,"removed: " + i);
// asyncTask = new RetrieveFeedsAfterBookmarkAsyncTask(context, null, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}
/**
* When tab comes visible, first displayed toot is defined as read
* @param visible boolean

1
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -253,6 +253,7 @@ public class Helper {
public static final String LAST_HOMETIMELINE_MAX_ID = "last_hometimeline_max_id";
public static final String BOOKMARK_ID = "bookmark_id";
public static final String BOOKMARK_DATE = "bookmark_date";
public static final String HOME_LAST_READ = "home_last_read";
public static final String LAST_READ_TOOT_ID = "last_read_toot_id";
public static final String LAST_READ_TOOT_DATE = "last_read_toot_date";
public static final String LAST_HOMETIMELINE_NOTIFICATION_MAX_ID = "last_hometimeline_notification_max_id";