From 2d29323cc2587721f6bb6b272bda0b095ee651ad Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sun, 17 May 2020 18:24:52 +0200
Subject: Release 2.35.4

---
 app/src/main/assets/changelogs/367.txt                      |  3 ++-
 .../java/app/fedilab/android/activities/BaseActivity.java   |  4 ++--
 .../android/services/LiveNotificationDelayedService.java    | 12 ++++++++++--
 .../fedilab/android/services/LiveNotificationService.java   | 13 ++++++++++---
 4 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/assets/changelogs/367.txt b/app/src/main/assets/changelogs/367.txt
index e57edd096..31665cbe7 100644
--- a/app/src/main/assets/changelogs/367.txt
+++ b/app/src/main/assets/changelogs/367.txt
@@ -1,5 +1,6 @@
 Added:
-- 100 Mo of cache for videos (can be changed in settings)
+- 100 Mb of cache for videos (can be changed in settings)
+- Bibliogram support (default: disabled)
 - Ouiches support for audio
 
 Changed:
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
index 3e97bb0a1..6ecb3e377 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
@@ -52,7 +52,7 @@ public class BaseActivity extends CyaneaAppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-        if (BuildConfig.DEBUG) {
+        /*if (BuildConfig.DEBUG) {
             StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
                     .detectDiskReads()
                     .detectDiskWrites()
@@ -67,7 +67,7 @@ public class BaseActivity extends CyaneaAppCompatActivity {
                     .penaltyLog()
                     // .penaltyDeath()
                     .build());
-        }
+        }*/
         canShowActionMode = true;
         super.onCreate(savedInstanceState);
 
diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
index 0aa989132..ccb999462 100644
--- a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
+++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
@@ -126,7 +126,11 @@ public class LiveNotificationDelayedService extends Service {
                     .setContentTitle(getString(R.string.top_notification))
                     .setSmallIcon(getNotificationIcon(LiveNotificationDelayedService.this))
                     .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
-            startForeground(1, notification);
+            if( notification != null) {
+                startForeground(1, notification);
+            }else{
+                return;
+            }
         }
 
 
@@ -315,7 +319,11 @@ public class LiveNotificationDelayedService extends Service {
                         .setSmallIcon(getNotificationIcon(LiveNotificationDelayedService.this))
                         .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
 
-                startForeground(1, notificationChannel);
+                if( notificationChannel != null) {
+                    startForeground(1, notificationChannel);
+                }else{
+                    return;
+                }
             }
 
             event = Helper.EventStreaming.NOTIFICATION;
diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
index 9a147e948..a7d1cfa65 100644
--- a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
+++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
@@ -140,7 +140,11 @@ public class LiveNotificationService extends Service implements NetworkStateRece
                     .setSmallIcon(getNotificationIcon(LiveNotificationService.this))
                     .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
 
-            startForeground(1, notification);
+            if( notification != null) {
+                startForeground(1, notification);
+            }else{
+                return;
+            }
         }
         if (!notify) {
             stopSelf();
@@ -317,8 +321,11 @@ public class LiveNotificationService extends Service implements NetworkStateRece
                             .setContentTitle(getString(R.string.top_notification))
                             .setSmallIcon(getNotificationIcon(LiveNotificationService.this))
                             .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
-
-                    startForeground(1, notificationChannel);
+                    if( notificationChannel != null) {
+                        startForeground(1, notificationChannel);
+                    }else{
+                        return;
+                    }
                 }
 
                 event = Helper.EventStreaming.NOTIFICATION;
-- 
cgit v1.2.3