From 94d23c924845790ab450531c96c79c3762bf92e3 Mon Sep 17 00:00:00 2001
From: Jannis Mattheis <contact@jmattheis.de>
Date: Wed, 14 Nov 2018 20:38:38 +0100
Subject: [PATCH] Update oauth package and ignore linting for it

OAuth2 isnt used therefore we can ignore it
---
 app/build.gradle                                           | 7 +++++++
 client/build.gradle                                        | 6 ++++--
 .../com/github/gotify/client/auth/OAuthOkHttpClient.java   | 1 +
 lint.xml                                                   | 6 ++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 lint.xml

diff --git a/app/build.gradle b/app/build.gradle
index 33ebe4a..367f05e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,6 +26,7 @@ android {
     }
     lintOptions {
         disable 'GoogleAppIndexingWarning'
+        lintConfig file('../lint.xml')
     }
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
@@ -50,6 +51,12 @@ dependencies {
     implementation 'com.squareup.picasso:picasso:2.71828'
 }
 
+configurations {
+    all {
+        exclude group: 'org.json', module: 'json'
+    }
+}
+
 spotless {
     java {
         target '**/*.java'
diff --git a/client/build.gradle b/client/build.gradle
index 0ca4f71..474f28d 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    oltu_version = "1.0.0"
+    oltu_version = "1.0.2"
     retrofit_version = "2.3.0"
     swagger_annotations_version = "1.5.15"
     junit_version = "4.12"
@@ -106,7 +106,9 @@ dependencies {
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version") {
+        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
+    }
     compile "io.gsonfire:gson-fire:$json_fire_version"
     compile "org.threeten:threetenbp:$threetenbp_version"
     testCompile "junit:junit:$junit_version"
diff --git a/client/src/main/java/com/github/gotify/client/auth/OAuthOkHttpClient.java b/client/src/main/java/com/github/gotify/client/auth/OAuthOkHttpClient.java
index 48c7496..c4a7781 100644
--- a/client/src/main/java/com/github/gotify/client/auth/OAuthOkHttpClient.java
+++ b/client/src/main/java/com/github/gotify/client/auth/OAuthOkHttpClient.java
@@ -59,6 +59,7 @@ public class OAuthOkHttpClient implements HttpClient {
                     response.body().string(), 
                     response.body().contentType().toString(),
                     response.code(),
+                    response.headers().toMultimap(),
                     responseClass);
         } catch (IOException e) {
             throw new OAuthSystemException(e);
diff --git a/lint.xml b/lint.xml
new file mode 100644
index 0000000..9a4eb24
--- /dev/null
+++ b/lint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="InvalidPackage">
+        <ignore path="**/org.apache.oltu.oauth2.client-1.0.2.jar"/>
+    </issue>
+</lint>
\ No newline at end of file