Support Android M

ovidos · Mar 19, 2019 · 0fad184 · 0fad184
1 parent 3c25ead
commit 0fad184
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 128 deletions.
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/androidTest/java/com/omralcorut/linkedinsdkexample/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/omralcorut/linkedinsdkexample/ExampleInstrumentedTest.kt
diff --git a/app/src/test/java/com/omralcorut/linkedinsdkexample/ExampleUnitTest.kt b/app/src/test/java/com/omralcorut/linkedinsdkexample/ExampleUnitTest.kt
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/linkedinsignin/src/main/java/com/omralcorut/linkedinsignin/ui/LinkedinSignInActivity.kt b/linkedinsignin/src/main/java/com/omralcorut/linkedinsignin/ui/LinkedinSignInActivity.kt
@@ -20,9 +20,8 @@ import java.net.URL
 import java.io.*
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
-
-
-
+import android.os.Build
+import android.support.annotation.RequiresApi
 
 class LinkedinSignInActivity: Activity() {
 
@@ -56,6 +55,18 @@ class LinkedinSignInActivity: Activity() {
         val url = generateUrl()
         webView.settings.javaScriptEnabled = true
         webView.webViewClient = object : WebViewClient() {
+            override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+                val uri = Uri.parse( url )
+                val authCode = uri.getQueryParameters(CODE).getOrNull(0)
+
+                if (authCode != null) {
+                    getAccessToken(authCode)
+                }
+
+                return super.shouldOverrideUrlLoading(view, url)
+            }
+
+            @RequiresApi(Build.VERSION_CODES.N)
             override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
                 val authCode = request.url.getQueryParameters(CODE).getOrNull(0)