From 593ce5284c6bd483972383389bb0b879b1e42442 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 9 Apr 2019 14:10:50 +0200
Subject: [PATCH] fix insane NPE

java.lang.NullPointerException: println needs a message
 at android.util.Log.println_native(Native Method)
 at android.util.Log.e(Log.java:232)
 at org.fdroid.fdroid.net.DownloaderService.handleIntent(DownloaderService.java:232)
 at org.fdroid.fdroid.net.DownloaderService.access$000(DownloaderService.java:88)
 at org.fdroid.fdroid.net.DownloaderService$ServiceHandler.handleMessage(DownloaderService.java:108)
 at android.os.Handler.dispatchMessage(Handler.java:102)
 at android.os.Looper.loop(Looper.java:148)
 at android.os.HandlerThread.run(HandlerThread.java:61)
---
 .../full/java/org/fdroid/fdroid/net/WifiStateChangeService.java | 2 +-
 app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java   | 2 +-
 app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
index baf3a68a1..db068494e 100644
--- a/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -276,7 +276,7 @@ public class WifiStateChangeService extends IntentService {
                                 if (BuildConfig.DEBUG) {
                                     e.printStackTrace();
                                 } else {
-                                    Log.i(TAG, e.getLocalizedMessage());
+                                    Log.i(TAG, "Getting subnet failed: " + e.getLocalizedMessage());
                                 }
                             }
                         }
diff --git a/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java b/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java
index 9530429b3..f28fb0e00 100644
--- a/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java
+++ b/app/src/main/java/org/fdroid/fdroid/AddRepoIntentService.java
@@ -69,7 +69,7 @@ public class AddRepoIntentService extends IntentService {
         try {
             urlString = normalizeUrl(uri);
         } catch (URISyntaxException e) {
-            Log.i(TAG, e.getLocalizedMessage());
+            Log.i(TAG, "Bad URI: " + e.getLocalizedMessage());
             return;
         }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
index cca7e76ee..f96e90607 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
@@ -248,7 +248,7 @@ public class DownloaderService extends Service {
                 | SSLHandshakeException | SSLKeyException | SSLPeerUnverifiedException | SSLProtocolException
                 | ProtocolException | UnknownHostException e) {
             // if the above list of exceptions changes, also change it in IndexV1Updater.update()
-            Log.e(TAG, e.getLocalizedMessage());
+            Log.e(TAG, "CONNECTION_FAILED: " + e.getLocalizedMessage());
             sendBroadcast(uri, Downloader.ACTION_CONNECTION_FAILED, localFile, repoId, canonicalUrl);
         } catch (IOException e) {
             e.printStackTrace();