summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstom79 <tschneider.ac@gmail.com>2018-11-18 17:24:12 +0100
committerstom79 <tschneider.ac@gmail.com>2018-11-18 17:24:12 +0100
commit5dbc6df2a1ced56865983f9b43c2ec83c0305ddb (patch)
tree37062b2dcc38a55fe8eb55bea6ff02ba7d708cf0
parent0cf144f14eca60be321b761e2506261557d9b29d (diff)
Prepares release 1.30.0
-rw-r--r--app/build.gradle4
-rw-r--r--app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java5
2 files changed, 7 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 92c907015..3299e356e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15
targetSdkVersion 28
- versionCode 184
- versionName "1.20.1-beta-3"
+ versionCode 185
+ versionName "1.30.0"
}
flavorDimensions "default"
buildTypes {
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 86945d1a0..a10079f21 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
@@ -570,6 +570,11 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
if( statuses != null && statuses.size() > 0)
retrieveMissingToots(statuses.get(0).getId());
}
+ }else if (type == RetrieveFeedsAsyncTask.Type.CONVERSATION){
+ if( getUserVisibleHint() ){
+ if( statuses != null && statuses.size() > 0)
+ retrieveMissingToots(statuses.get(0).getId());
+ }
}else if (type == RetrieveFeedsAsyncTask.Type.HOME){
statusListAdapter.updateMuted(mutedAccount);
if( statuses != null && statuses.size() > 0)