From 198ad843c1fabc8cf57ffe85c77230288cd6d7a4 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 30 May 2016 11:15:35 +0200
Subject: [PATCH] fix crash when UpdateService receives null Intent

I have no idea what would send UpdateService a null Intent, but there have
been reports from ACRA:

ANDROID_VERSION=5.1.1
APP_VERSION_NAME=0.99.2
BRAND=samsung
PHONE_MODEL=SM-G901F
java.lang.NullPointerException: Attempt to invoke virtual method 'java.lang.String android.content.Intent.getStringExtra(java.lang.String)' on a null object reference
	at org.fdroid.fdroid.UpdateService.onHandleIntent(UpdateService.java:342)
	at android.app.IntentService$ServiceHandler.handleMessage(IntentService.java:65)
	at android.os.Handler.dispatchMessage(Handler.java:102)
	at android.os.Looper.loop(Looper.java:135)
	at android.os.HandlerThread.run(HandlerThread.java:61)
---
 app/src/main/java/org/fdroid/fdroid/UpdateService.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
index 0d189b4fc..b659c0976 100644
--- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java
+++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
@@ -314,8 +314,12 @@ public class UpdateService extends IntentService {
         Process.setThreadPriority(Process.THREAD_PRIORITY_LOWEST);
 
         final long startTime = System.currentTimeMillis();
-        String address = intent.getStringExtra(EXTRA_ADDRESS);
-        boolean manualUpdate = intent.getBooleanExtra(EXTRA_MANUAL_UPDATE, false);
+        boolean manualUpdate = false;
+        String address = null;
+        if (intent != null) {
+            address = intent.getStringExtra(EXTRA_ADDRESS);
+            manualUpdate = intent.getBooleanExtra(EXTRA_MANUAL_UPDATE, false);
+        }
 
         try {
             // See if it's time to actually do anything yet...