From 157b0b1c3b9f299e13461728c06507c18707f49c Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sun, 14 Jan 2018 19:03:20 +0100
Subject: [PATCH] Fixes some errors

---
 .../mastodon/asynctasks/RetrieveNotificationsAsyncTask.java  | 5 +++++
 .../java/fr/gouv/etalab/mastodon/client/HttpsConnection.java | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveNotificationsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveNotificationsAsyncTask.java
index cebbb8509..ff0ceff2b 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveNotificationsAsyncTask.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveNotificationsAsyncTask.java
@@ -22,6 +22,7 @@ import java.lang.ref.WeakReference;
 import fr.gouv.etalab.mastodon.client.API;
 import fr.gouv.etalab.mastodon.client.APIResponse;
 import fr.gouv.etalab.mastodon.client.Entities.Account;
+import fr.gouv.etalab.mastodon.client.Entities.Error;
 import fr.gouv.etalab.mastodon.interfaces.OnRetrieveNotificationsInterface;
 
 
@@ -59,6 +60,10 @@ public class RetrieveNotificationsAsyncTask extends AsyncTask<Void, Void, Void>
             api = new API(this.contextReference.get());
             apiResponse = api.getNotifications(max_id, display);
         }else {
+            if( this.contextReference.get() == null) {
+                apiResponse.setError(new Error());
+                return null;
+            }
             api = new API(this.contextReference.get(), account.getInstance(), account.getToken());
             apiResponse = api.getNotificationsSince(max_id, display);
         }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsConnection.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsConnection.java
index ec8835c35..87c85e978 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsConnection.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsConnection.java
@@ -731,6 +731,8 @@ public class HttpsConnection {
 
 
     private void getSinceMaxId(){
+        if( httpsURLConnection == null)
+            return;
         Map<String, List<String>> map = httpsURLConnection.getHeaderFields();
         for (Map.Entry<String, List<String>> entry : map.entrySet()) {
             if( entry.toString().startsWith("Link")){