diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index 1d04e96e1..b7a7a7ab2 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -1628,6 +1628,8 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount toot_content.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { + if( position >= tags.size() ) + return; String tag = tags.get(position); String deltaSearch = ""; if( currentCursorPosition-searchLength > 0 && currentCursorPosition < oldContent.length() ) 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 1ba378666..cf5022233 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 @@ -78,7 +78,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn private Intent streamingFederatedIntent, streamingLocalIntent; LinearLayoutManager mLayoutManager; boolean firstTootsLoaded; - private String lastReadStatus; private String userId, instance; private SharedPreferences sharedpreferences; @@ -134,7 +133,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn mLayoutManager = new LinearLayoutManager(context); lv_status.setLayoutManager(mLayoutManager); - lastReadStatus = sharedpreferences.getString(Helper.LAST_NOTIFICATION_MAX_ID + userId + instance, null); + instance = sharedpreferences.getString(Helper.PREF_INSTANCE, context!=null?Helper.getLiveInstance(context):null); lv_status.addOnScrollListener(new RecyclerView.OnScrollListener() { @@ -160,7 +159,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn nextElementLoader.setVisibility(View.GONE); } } - if(statuses != null && statuses.size() > firstVisibleItem ) + if(type == RetrieveFeedsAsyncTask.Type.HOME && statuses != null && statuses.size() > firstVisibleItem ) if( context instanceof BaseMainActivity){ SharedPreferences.Editor editor = sharedpreferences.edit(); Long bookmarkL = Long.parseLong(statuses.get(firstVisibleItem).getId()) + 1; @@ -588,7 +587,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn String lastNotif = sharedpreferences.getString(Helper.LAST_HOMETIMELINE_MAX_ID + userId + instance, null); if( lastNotif == null || Long.parseLong(statusId) > Long.parseLong(lastNotif)){ - this.lastReadStatus = statusId; MainActivity.countNewStatus = 0; SharedPreferences.Editor editor = sharedpreferences.edit(); editor.putString(Helper.LAST_HOMETIMELINE_MAX_ID + userId + instance, statusId);