From d1a2c5b7a7a71c3d877508f0e8ebfe1176b63b12 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 14 Mar 2019 21:40:29 +0100
Subject: fix some crashes

---
 src/main/java/de/pixart/messenger/services/AlarmReceiver.java | 4 +++-
 src/main/java/de/pixart/messenger/ui/widget/RichLinkView.java | 3 ++-
 src/main/java/de/pixart/messenger/utils/RichPreview.java      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/pixart/messenger')

diff --git a/src/main/java/de/pixart/messenger/services/AlarmReceiver.java b/src/main/java/de/pixart/messenger/services/AlarmReceiver.java
index 887a59684..74ee14345 100644
--- a/src/main/java/de/pixart/messenger/services/AlarmReceiver.java
+++ b/src/main/java/de/pixart/messenger/services/AlarmReceiver.java
@@ -15,7 +15,9 @@ public class AlarmReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         if (intent.getAction().contains("exportlogs")) {
             Log.d(Config.LOGTAG, "Received alarm broadcast to export logs");
-            Compatibility.startService(context, new Intent(context, ExportBackupService.class));
+            final Intent backupIntent = new Intent(context, ExportBackupService.class);
+            backupIntent.putExtra("NOTIFY_ON_BACKUP_COMPLETE", false);
+            Compatibility.startService(context, intent);
         }
     }
 }
diff --git a/src/main/java/de/pixart/messenger/ui/widget/RichLinkView.java b/src/main/java/de/pixart/messenger/ui/widget/RichLinkView.java
index ec99c6aee..110665001 100644
--- a/src/main/java/de/pixart/messenger/ui/widget/RichLinkView.java
+++ b/src/main/java/de/pixart/messenger/ui/widget/RichLinkView.java
@@ -82,7 +82,7 @@ public class RichLinkView extends RelativeLayout {
         textViewTitle = findViewById(R.id.rich_link_title);
         textViewDesp = findViewById(R.id.rich_link_desp);
         imageView.setAdjustViewBounds(true);
-        if (!meta.getImageurl().equals("") && !meta.getImageurl().isEmpty()) {
+        if (meta.getImageurl() != null && !meta.getImageurl().equals("") && !meta.getImageurl().isEmpty()) {
             if (!dataSaverDisabled) {
                 Picasso.get()
                         .load(R.drawable.ic_web_grey600_48)
@@ -94,6 +94,7 @@ public class RichLinkView extends RelativeLayout {
                         .resize(80, 80)
                         .centerInside()
                         .placeholder(R.drawable.ic_web_grey600_48)
+                        .error(R.drawable.ic_web_grey600_48)
                         .into(imageView);
             }
         } else {
diff --git a/src/main/java/de/pixart/messenger/utils/RichPreview.java b/src/main/java/de/pixart/messenger/utils/RichPreview.java
index cdde6baaa..7824478d6 100644
--- a/src/main/java/de/pixart/messenger/utils/RichPreview.java
+++ b/src/main/java/de/pixart/messenger/utils/RichPreview.java
@@ -177,7 +177,7 @@ public class RichPreview {
             doc = Jsoup.connect(url)
                     .timeout(Config.CONNECT_TIMEOUT * 1000)
                     .get();
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
-- 
cgit v1.2.3