summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstom79 <tschneider.ac@gmail.com>2018-12-15 19:19:29 +0100
committerstom79 <tschneider.ac@gmail.com>2018-12-15 19:19:29 +0100
commit4e6fd95518210baf70d10347427b13339b283dc5 (patch)
tree787fd25b731270d1a329c95721a5e8ceabafe727
parent9944c1908ef861165cc82da01a12bca1ee2bb28f (diff)
Prepares release 1.41.1
-rw-r--r--app/build.gradle4
-rw-r--r--app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java4
2 files changed, 3 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 3d52c7bff..b05c9891a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 16
targetSdkVersion 28
- versionCode 203
- versionName "1.41.0"
+ versionCode 204
+ versionName "1.41.1"
multiDexEnabled true
}
dexOptions {
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 52e3d94eb..2cbfd9f27 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
@@ -485,7 +485,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
}
}
- }else {
+ }else if ( statusListAdapter != null){
if( tagTimeline == null || !tagTimeline.isART() || (tagTimeline.isART() && tagTimeline.isNSFW())) {
this.statuses.addAll(statuses);
statusListAdapter.notifyItemRangeInserted(previousPosition, statuses.size());
@@ -499,8 +499,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
this.statuses.addAll(safeStatuses);
statusListAdapter.notifyItemRangeInserted(previousPosition, safeStatuses.size());
}
-
-
}
if( type == RetrieveFeedsAsyncTask.Type.HOME ) {
//Update the id of the last toot retrieved