From bdee44ab8e40c74034db70dfaa11085a4c9fce0e Mon Sep 17 00:00:00 2001
From: Peter Stuifzand <peter@stuifzand.eu>
Date: Sun, 22 Apr 2018 00:32:35 +0200
Subject: [PATCH] Cleanup of VerifyAuthenticationTask

---
 .../auth/VerifyAuthenticationTask.java        | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/eu/stuifzand/micropub/auth/VerifyAuthenticationTask.java b/app/src/main/java/eu/stuifzand/micropub/auth/VerifyAuthenticationTask.java
index f4f89f1..ae77b2b 100644
--- a/app/src/main/java/eu/stuifzand/micropub/auth/VerifyAuthenticationTask.java
+++ b/app/src/main/java/eu/stuifzand/micropub/auth/VerifyAuthenticationTask.java
@@ -1,6 +1,5 @@
 package eu.stuifzand.micropub.auth;
 
-import android.accounts.Account;
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.content.Intent;
@@ -97,24 +96,23 @@ public class VerifyAuthenticationTask extends AsyncTask<String, Void, VerifyAuth
                 return new AuthenticationResult("Unsuccessful response from authorization_endpoint: HTTP status code is " + String.valueOf(response.code()));
             }
             ResponseBody body = response.body();
-            if (!response.header("Content-Type").contains("application/json")) {
-                return new AuthenticationResult("Unsupported content type of authorization_endpoint response: " + response.header("Content-Type"));
-            }
+            if (response.header("Content-Type").contains("application/json")) {
+                JsonParser parser = new JsonParser();
+                try {
+                    JsonElement jsonElement = parser.parse(body.string());
+                    JsonObject element = jsonElement.getAsJsonObject();
 
-            JsonParser parser = new JsonParser();
-            try {
-                JsonElement jsonElement = parser.parse(body.string());
-                JsonObject element = jsonElement.getAsJsonObject();
-
-                JsonElement meElement = element.get("me");
-                if (meElement == null) {
-                    return new AuthenticationResult("Missing element \"me\" in authorization_endpoint response");
+                    JsonElement meElement = element.get("me");
+                    if (meElement == null) {
+                        return new AuthenticationResult("Missing element \"me\" in authorization_endpoint response");
+                    }
+                    String resultMe = meElement.getAsString();
+                    return new AuthenticationResult(resultMe, code);
+                } catch (JsonParseException e) {
+                    return new AuthenticationResult("Could not parse json response from authorization_endpoint");
                 }
-                String resultMe = meElement.getAsString();
-                return new AuthenticationResult(resultMe, code);
-            } catch (JsonParseException e) {
-                return new AuthenticationResult("Could not parse json response from authorization_endpoint");
             }
+            return new AuthenticationResult("Unsupported content type of authorization_endpoint response: " + response.header("Content-Type"));
         } catch (IOException e) {
             return new AuthenticationResult("Could not get the response from the endpoint");
         } finally {