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

Fix an issue when adding followed instances

This commit is contained in:
tom79 2019-05-08 15:05:54 +02:00
parent 761d6ee2c5
commit 1672135415
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1703,8 +1703,6 @@ public abstract class BaseMainActivity extends BaseActivity
ReorderTimelinesActivity.updated = false;
new ManageTimelines().createTabs(BaseMainActivity.this, manageTimelines);
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
boolean optimize_loading = sharedpreferences.getBoolean(Helper.SET_OPTIMIZE_LOADING, false);
boolean displayFollowInstance = sharedpreferences.getBoolean(Helper.SET_DISPLAY_FOLLOW_INSTANCE, true);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
final NavigationView navigationView = findViewById(R.id.nav_view);
@ -1716,9 +1714,8 @@ public abstract class BaseMainActivity extends BaseActivity
position = (timelines.size()-1);
if( position < 0)
position = 0;
setTitle("");
/*if( !optimize_loading)
viewPager.setOffscreenPageLimit(countPage);*/
if( toolbarTitle != null)
toolbarTitle.setVisibility(View.GONE);
viewPager.setOffscreenPageLimit(2);
main_app_container = findViewById(R.id.main_app_container);
adapter = new PagerAdapter

6
app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/SyncTimelinesAsyncTask.java
View File

@ -209,7 +209,8 @@ public class SyncTimelinesAsyncTask extends AsyncTask<Void, Void, Void> {
for(ManageTimelines manageTimeline: manageTimelines){
if( manageTimeline.getRemoteInstance() == null )
continue;
if(manageTimeline.getRemoteInstance().getHost().equals(instance.getHost())){
if(manageTimeline.getRemoteInstance().getHost().trim().equals(instance.getHost().trim())){
isInDb = true;
timelines_tmp = manageTimeline;
break;
@ -222,6 +223,7 @@ public class SyncTimelinesAsyncTask extends AsyncTask<Void, Void, Void> {
manageTL.setType(ManageTimelines.Type.INSTANCE);
manageTL.setPosition(manageTimelines.size());
new TimelinesDAO(contextReference.get(), db).insert(manageTL);
manageTimelines.add(manageTL);
}else{
//Update list
timelines_tmp.setRemoteInstance(instance);
@ -233,7 +235,7 @@ public class SyncTimelinesAsyncTask extends AsyncTask<Void, Void, Void> {
continue;
boolean shouldBeRemoved = true;
for(RemoteInstance instance: instancesInDb){
if( instance.getHost().equals(manageTimelines.getRemoteInstance().getHost())){
if( instance.getHost().trim().equals(manageTimelines.getRemoteInstance().getHost().trim())){
shouldBeRemoved = false;
}
}