summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortom79 <tschneider.ac@gmail.com>2019-09-14 18:53:23 +0200
committertom79 <tschneider.ac@gmail.com>2019-09-14 18:53:23 +0200
commit437854911c303165e462e35b36d2ccb03987ff80 (patch)
tree68071d74004a294010e4348a3cee434decb41a5e
parent94084d7cbfdb5e84565b7c9be67ad63d3a75bf11 (diff)
Fix live local
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java6
-rw-r--r--fastlane/metadata/android/en-US/changelogs/316.txt3
2 files changed, 5 insertions, 4 deletions
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
index d03e69acb..cfe5f252a 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
@@ -778,7 +778,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
super.setMenuVisibility(visible);
if (context == null)
return;
- boolean liveNotifications = sharedpreferences.getBoolean(Helper.SET_LIVE_NOTIFICATIONS, true);
+ int liveNotifications = Helper.liveNotifType(context);
//Store last toot id for home timeline to avoid to notify for those that have been already seen
if (type == RetrieveFeedsAsyncTask.Type.HOME) {
if (visible) {
@@ -791,7 +791,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putBoolean(Helper.SHOULD_CONTINUE_STREAMING_FEDERATED + userId + instance, true);
editor.apply();
- if (liveNotifications) {
+ if (liveNotifications != 2) {
streamingFederatedIntent = new Intent(context, StreamingFederatedTimelineService.class);
try {
context.startService(streamingFederatedIntent);
@@ -813,7 +813,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putBoolean(Helper.SHOULD_CONTINUE_STREAMING_LOCAL + userId + instance, true);
editor.apply();
- if (liveNotifications) {
+ if (liveNotifications != 2) {
streamingLocalIntent = new Intent(context, StreamingLocalTimelineService.class);
try {
context.startService(streamingLocalIntent);
diff --git a/fastlane/metadata/android/en-US/changelogs/316.txt b/fastlane/metadata/android/en-US/changelogs/316.txt
index fc25840de..27a58f67d 100644
--- a/fastlane/metadata/android/en-US/changelogs/316.txt
+++ b/fastlane/metadata/android/en-US/changelogs/316.txt
@@ -13,4 +13,5 @@ Fixed
- Unknown URL scheme with built-in browser
- Fix mentions
- Crash when clicking on thumbs-up button for Peertube videos with a Mastodon account
-- Fix a scrolling issue \ No newline at end of file
+- Fix a scrolling issue
+- Fix Peertube playlist 1.4+ \ No newline at end of file