diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml new file mode 100644 index 0000000..1dfd39d --- /dev/null +++ b/.idea/markdown-navigator.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 2641770..af0bbdd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,89 +5,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/androidTest/java/com/omralcorut/linkedinsdkexample/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/omralcorut/linkedinsdkexample/ExampleInstrumentedTest.kt deleted file mode 100644 index 8e01297..0000000 --- a/app/src/androidTest/java/com/omralcorut/linkedinsdkexample/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.omralcorut.linkedinsdkexample - -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getTargetContext() - assertEquals("com.omralcorut.linkedinsdkexample", appContext.packageName) - } -} diff --git a/app/src/test/java/com/omralcorut/linkedinsdkexample/ExampleUnitTest.kt b/app/src/test/java/com/omralcorut/linkedinsdkexample/ExampleUnitTest.kt deleted file mode 100644 index 0106850..0000000 --- a/app/src/test/java/com/omralcorut/linkedinsdkexample/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.omralcorut.linkedinsdkexample - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/build.gradle b/build.gradle index f955cc3..a6b2983 100644 --- 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 index 05cba7a..1a80bb8 100644 --- 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)