Changed wordpress_logged_in to quantimodo_logged_in cookie & "https:/…

…/maven.google.com"
QuantiModo · Jan 15, 2018 · b36641d · b36641d
1 parent 06ec710
commit b36641d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,6 +18,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 

diff --git a/quantimodo-sdk-tools/build.gradle b/quantimodo-sdk-tools/build.gradle
@@ -15,6 +15,9 @@ apply plugin: 'com.neenbedankt.android-apt'
 repositories {
     mavenCentral()
     jcenter()
+    maven {
+        url "https://maven.google.com"
+    }
 }
 
 android {

diff --git a/quantimodo-sdk-tools/src/androidTest/java/com/quantimodo/tools/testhelpers/TestHelper.java b/quantimodo-sdk-tools/src/androidTest/java/com/quantimodo/tools/testhelpers/TestHelper.java
@@ -33,7 +33,7 @@ public static String logIn(final Context context) throws ExecutionException, Int
             List<HttpCookie> cookieList = cookieStore.get(URI.create(QUANTIMODO_ADDRESS));
 
             for (HttpCookie cookie : cookieList) {
-                if (cookie.getName().contains("wordpress_logged_in_")) {
+                if (cookie.getName().contains("quantimodo_logged_in_")) {
                     cookieToken = cookie.getValue();
                     break;
                 }

diff --git a/...ols/src/main/java/com/quantimodo/tools/activities/QuantimodoWebAuthenticatorActivity.java b/...ols/src/main/java/com/quantimodo/tools/activities/QuantimodoWebAuthenticatorActivity.java
@@ -195,10 +195,10 @@ public QMAuthClient(OnAuthenticationCompleteListener listener, ToolsPrefs toolsP
         public boolean shouldOverrideUrlLoading(WebView view, String url) {
             if (url.startsWith(toolsPrefs.getApiUrl())) {
                 String cookies = cookieManager.getCookie(toolsPrefs.getApiUrl());
-                if (cookies != null && cookies.contains("wordpress_logged_in")) {
+                if (cookies != null && cookies.contains("quantimodo_logged_in")) {
                     String[] splits = cookies.split("; ");
                     for (String cookie : splits) {
-                        if (cookie.startsWith("wordpress_logged_in")) {
+                        if (cookie.startsWith("quantimodo_logged_in")) {
                             listener.onSuccess(cookie);
                             return true;
                         }

diff --git a/sdk/src/androidTest/java/com/quantimodo/android/sdk/TestHelper.java b/sdk/src/androidTest/java/com/quantimodo/android/sdk/TestHelper.java
@@ -31,7 +31,7 @@ public static String logIn(final Context context) throws ExecutionException, Int
             List<HttpCookie> cookieList = cookieStore.get(URI.create(QUANTIMODO_ADDRESS));
 
             for (HttpCookie cookie : cookieList) {
-                if (cookie.getName().contains("wordpress_logged_in_")) {
+                if (cookie.getName().contains("quantimodo_logged_in_")) {
                     return cookie.getValue();
                 }
             }

diff --git a/sdk/src/main/java/com/quantimodo/android/sdk/login/AuthenticatorActivity.java b/sdk/src/main/java/com/quantimodo/android/sdk/login/AuthenticatorActivity.java
@@ -186,10 +186,10 @@ public QMAuthClient(OnAuthenticationCompleteListener listener) {
         public boolean shouldOverrideUrlLoading(WebView view, String url) {
             if (url.startsWith(ToolsPrefs.getInstance().getApiUrl())) {
                 String cookies = cookieManager.getCookie(ToolsPrefs.getInstance().getApiUrl());
-                if (cookies != null && cookies.contains("wordpress_logged_in")) {
+                if (cookies != null && cookies.contains("quantimodo_logged_in")) {
                     String[] splits = cookies.split("; ");
                     for (String cookie : splits) {
-                        if (cookie.startsWith("wordpress_logged_in")) {
+                        if (cookie.startsWith("quantimodo_logged_in")) {
                             listener.onSuccess(cookie);
                             return true;
                         }

diff --git a/testing-utils/build.gradle b/testing-utils/build.gradle
@@ -10,6 +10,9 @@ apply plugin: 'com.android.library'
 
 repositories {
     jcenter()
+    maven {
+        url "https://maven.google.com"
+    }
 }
 
 android {