change ClientID

webex · Jul 16, 2018 · 0616671 · 0616671
1 parent a55df7f
commit 0616671
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,10 +15,16 @@ android {
 
         multiDexEnabled true
 
+        buildConfigField "String", "CLIENT_ID", "\"C338457876c27e853fb5e4dc85c6087164073e1e2bf415c081b600fe654d7af60\""
+        buildConfigField "String", "CLIENT_SEC", "\"0dc8b9c77c8b5597e7eef4b72c7dfaf8d5b834fdba24cf0a0b55eb85ae209b31\""
+        buildConfigField "String", "REDIRECT_URL", "\"AndroidKitchenSink://response\""
+        buildConfigField "String", "SCOPE", "\"spark:all\""
+        /*
         buildConfigField "String", "CLIENT_ID", "\"C416dd36dd57b536a35816978e4f063a98849d285ca191f5566a32c0f0c3481ab\""
         buildConfigField "String", "CLIENT_SEC", "\"bc851e0f4d4bd62c020a45de08e374101910200d43096f32d14b9e08164adac7\""
         buildConfigField "String", "REDIRECT_URL", "\"KitchenSink://response\""
         buildConfigField "String", "SCOPE", "\"spark:all\""
+        */
     }
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
@@ -60,6 +66,7 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:recyclerview-v7:27.0.2'
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
@@ -80,18 +87,3 @@ dependencies {
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/java/com/cisco/sparksdk/kitchensink/actions/commands/SparkIdLoginAction.java b/app/src/main/java/com/cisco/sparksdk/kitchensink/actions/commands/SparkIdLoginAction.java
@@ -58,8 +58,9 @@ public SparkIdLoginAction(WebView view) {
     @Override
     public void execute() {
         OAuthWebViewAuthenticator oAuth2;
-        oAuth2 = new OAuthWebViewAuthenticator(clientId, clientSec, redirect, scope);
+        oAuth2 = new OAuthWebViewAuthenticator(clientId, clientSec, scope, redirect);
         Spark spark = new Spark(getApplication(), oAuth2);
+        spark.messages();
         SparkAgent.getInstance().setSpark(spark);
         oAuth2.authorize(view, result -> {
             if (result.isSuccessful()) {

diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
 allprojects {
     repositories {
         //mavenCentral()
-        mavenLocal()
+        //mavenLocal()
         jcenter()
         google()
         maven {

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,2 @@
-include ':app'
+include ':app',':sdk'
+project(':sdk').projectDir = new File('spark-android-sdk/sdk')