From 3e63caebccbfb979b8ff3d7964ad5992ebdbc1b6 Mon Sep 17 00:00:00 2001 From: Matt Insko Date: Wed, 10 Feb 2016 11:06:06 -0500 Subject: [PATCH 1/7] Ignoring lint issues. --- .gitignore | 3 +++ app/common/build.gradle | 3 +++ app/santa-tracker/build.gradle | 3 +++ app/village/build.gradle | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..74e81c9af --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build +.gradle +local.properties diff --git a/app/common/build.gradle b/app/common/build.gradle index 5d7210c1a..eb464c3dc 100644 --- a/app/common/build.gradle +++ b/app/common/build.gradle @@ -24,6 +24,9 @@ android { minSdkVersion 15 targetSdkVersion 21 } + lintOptions { + disable 'MissingTranslation' + } } repositories { diff --git a/app/santa-tracker/build.gradle b/app/santa-tracker/build.gradle index 804a76938..15b4d5ad5 100644 --- a/app/santa-tracker/build.gradle +++ b/app/santa-tracker/build.gradle @@ -57,6 +57,9 @@ android { proguardFile 'proguard.txt' } } + lintOptions { + disable 'NewApi' + } } repositories { diff --git a/app/village/build.gradle b/app/village/build.gradle index b2a200528..feddf6783 100644 --- a/app/village/build.gradle +++ b/app/village/build.gradle @@ -24,6 +24,9 @@ android { minSdkVersion 15 targetSdkVersion 21 } + lintOptions { + disable 'NewApi' + } } repositories { From e4954c3ee489a41c7e5fdfb3291e001a0d294e83 Mon Sep 17 00:00:00 2001 From: Matt Insko Date: Wed, 10 Feb 2016 11:10:46 -0500 Subject: [PATCH 2/7] Disabling Proguard --- app/santa-tracker/build.gradle | 8 ++++---- app/wearable/build.gradle | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/santa-tracker/build.gradle b/app/santa-tracker/build.gradle index 15b4d5ad5..4988a1805 100644 --- a/app/santa-tracker/build.gradle +++ b/app/santa-tracker/build.gradle @@ -47,14 +47,14 @@ android { } dogfood { - minifyEnabled true - proguardFile 'proguard.txt' + //minifyEnabled true + //proguardFile 'proguard.txt' // signingConfig signingConfigs.dogfood } release { - minifyEnabled true - proguardFile 'proguard.txt' + //minifyEnabled true + //proguardFile 'proguard.txt' } } lintOptions { diff --git a/app/wearable/build.gradle b/app/wearable/build.gradle index 1b924aad2..2c05624b0 100644 --- a/app/wearable/build.gradle +++ b/app/wearable/build.gradle @@ -49,13 +49,13 @@ android { } dogfood { - minifyEnabled true - proguardFile 'proguard-wear.txt' + //minifyEnabled true + //proguardFile 'proguard-wear.txt' // signingConfig signingConfigs.dogfood } release { - minifyEnabled true - proguardFile 'proguard-wear.txt' + //minifyEnabled true + //proguardFile 'proguard-wear.txt' } } From 9616147ba1f66772269d330409ce67d04fe0ca8e Mon Sep 17 00:00:00 2001 From: Matt Insko Date: Wed, 10 Feb 2016 11:51:40 -0500 Subject: [PATCH 3/7] Removing dogfood build and signing release builds. --- app/santa-tracker/build.gradle | 22 ++++++---------------- app/wearable/build.gradle | 22 ++++++---------------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/app/santa-tracker/build.gradle b/app/santa-tracker/build.gradle index 4988a1805..d27dde0c8 100644 --- a/app/santa-tracker/build.gradle +++ b/app/santa-tracker/build.gradle @@ -28,33 +28,23 @@ android { versionName "2.1.2" } signingConfigs { - debug { -// storeFile file("../santa-tracker-debug.keystore") -// keyAlias "androiddebugkey" - } - dogfood { -// storeFile file("../santa-tracker-dogfood.keystore") -// storePassword "" -// keyAlias "releasekey" -// keyPassword "" + standard { + storeFile file("../myKeystore.keystore") + storePassword "password" + keyAlias "santa_app" + keyPassword "password" } } buildTypes { debug { applicationIdSuffix ".debug" versionNameSuffix "-debug" - signingConfig signingConfigs.debug - } - - dogfood { - //minifyEnabled true - //proguardFile 'proguard.txt' - // signingConfig signingConfigs.dogfood } release { //minifyEnabled true //proguardFile 'proguard.txt' + signingConfig signingConfigs.standard } } lintOptions { diff --git a/app/wearable/build.gradle b/app/wearable/build.gradle index 2c05624b0..2284a0e6a 100644 --- a/app/wearable/build.gradle +++ b/app/wearable/build.gradle @@ -30,32 +30,22 @@ android { signingConfigs { - debug { -// storeFile file("../santa-tracker-debug.keystore") -// keyAlias "androiddebugkey" - } - dogfood { -// storeFile file("../santa-tracker-dogfood.keystore") -// storePassword "" -// keyAlias "releasekey" -// keyPassword "" + standard { + storeFile file("../myKeystore.keystore") + storePassword "password" + keyAlias "santa_wear_app" + keyPassword "password" } } buildTypes { debug { applicationIdSuffix ".debug" versionNameSuffix "-debug" - signingConfig signingConfigs.debug - } - - dogfood { - //minifyEnabled true - //proguardFile 'proguard-wear.txt' - // signingConfig signingConfigs.dogfood } release { //minifyEnabled true //proguardFile 'proguard-wear.txt' + signingConfig signingConfigs.standard } } From 52ae68498c03a608e6dab982baaf6c6a7df1c6a3 Mon Sep 17 00:00:00 2001 From: Matt Insko Date: Wed, 10 Feb 2016 13:18:53 -0500 Subject: [PATCH 4/7] Removing values-es-r419 and values-debug resources. --- .../res/values-es-r419/strings_jetpack.xml | 21 ------------ .../src/main/res/values-es-r419/strings.xml | 28 ---------------- .../res/values-es-r419/strings_appname.xml | 20 ----------- .../res/values-es-r419/strings_gumball.xml | 20 ----------- .../res/values-es-r419/strings_memory.xml | 23 ------------- .../values-es-r419/strings_notification.xml | 22 ------------- .../res/values-es-r419/strings_village.xml | 33 ------------------- .../main/res/values-debug/donottranslate.xml | 20 ----------- 8 files changed, 187 deletions(-) delete mode 100644 app/common/src/main/res/values-es-r419/strings_jetpack.xml delete mode 100755 app/santa-tracker/src/main/res/values-es-r419/strings.xml delete mode 100644 app/santa-tracker/src/main/res/values-es-r419/strings_appname.xml delete mode 100755 app/santa-tracker/src/main/res/values-es-r419/strings_gumball.xml delete mode 100755 app/santa-tracker/src/main/res/values-es-r419/strings_memory.xml delete mode 100755 app/santa-tracker/src/main/res/values-es-r419/strings_notification.xml delete mode 100755 app/santa-tracker/src/main/res/values-es-r419/strings_village.xml delete mode 100644 app/wearable/src/main/res/values-debug/donottranslate.xml diff --git a/app/common/src/main/res/values-es-r419/strings_jetpack.xml b/app/common/src/main/res/values-es-r419/strings_jetpack.xml deleted file mode 100644 index d29a98a0d..000000000 --- a/app/common/src/main/res/values-es-r419/strings_jetpack.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - Accede a tu cuenta para desbloquear logros y publicar tu puntuación - Volver a jugar - Puntuación - diff --git a/app/santa-tracker/src/main/res/values-es-r419/strings.xml b/app/santa-tracker/src/main/res/values-es-r419/strings.xml deleted file mode 100755 index beadea7a8..000000000 --- a/app/santa-tracker/src/main/res/values-es-r419/strings.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - Seguir a Santa - Santa está ocupado preparándose para el próximo año. - Estamos intentando comunicarnos con Santa. - Aún estamos intentando comunicarnos con Santa. - Aspectos legales y privacidad - Aviso legal - Política de privacidad - Condiciones del servicio - Licencias de código abierto - Salir - diff --git a/app/santa-tracker/src/main/res/values-es-r419/strings_appname.xml b/app/santa-tracker/src/main/res/values-es-r419/strings_appname.xml deleted file mode 100644 index f7ffb899c..000000000 --- a/app/santa-tracker/src/main/res/values-es-r419/strings_appname.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Sigue a Santa - diff --git a/app/santa-tracker/src/main/res/values-es-r419/strings_gumball.xml b/app/santa-tracker/src/main/res/values-es-r419/strings_gumball.xml deleted file mode 100755 index becd37b87..000000000 --- a/app/santa-tracker/src/main/res/values-es-r419/strings_gumball.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - Pausar el juego - Reanudar el juego - \ No newline at end of file diff --git a/app/santa-tracker/src/main/res/values-es-r419/strings_memory.xml b/app/santa-tracker/src/main/res/values-es-r419/strings_memory.xml deleted file mode 100755 index 9af7aaa18..000000000 --- a/app/santa-tracker/src/main/res/values-es-r419/strings_memory.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - PUNTUACIÓN - NIVEL - VOLVER A JUGAR - Pausar el juego - Reanudar el juego - \ No newline at end of file diff --git a/app/santa-tracker/src/main/res/values-es-r419/strings_notification.xml b/app/santa-tracker/src/main/res/values-es-r419/strings_notification.xml deleted file mode 100755 index 6673024b3..000000000 --- a/app/santa-tracker/src/main/res/values-es-r419/strings_notification.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - ¡Santa ya despegó! - SABÍAS QUE - Actualización de Santa - diff --git a/app/santa-tracker/src/main/res/values-es-r419/strings_village.xml b/app/santa-tracker/src/main/res/values-es-r419/strings_village.xml deleted file mode 100755 index e947a1832..000000000 --- a/app/santa-tracker/src/main/res/values-es-r419/strings_village.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - Sigue a Santa el 24 de diciembre. - Gumball - Gumball estará disponible el 1.º de diciembre. - Gumball no está disponible en este momento. - Memory - Memory estará disponible el 1.º de diciembre. - Memory no está disponible en este momento. - Elf Jetpack - Elf Jetpack estará disponible el 1.º de diciembre. - Elf Jetpack no está disponible en este momento. - Rocket Sleigh - Video - El video se desbloqueará el %1$d de diciembre. - El video no está disponible en este momento. - \ No newline at end of file diff --git a/app/wearable/src/main/res/values-debug/donottranslate.xml b/app/wearable/src/main/res/values-debug/donottranslate.xml deleted file mode 100644 index 089a65eb2..000000000 --- a/app/wearable/src/main/res/values-debug/donottranslate.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Santa Tracker Debug - \ No newline at end of file From 66c068f8f0cb5f2134ff335a950b9401d60e43bc Mon Sep 17 00:00:00 2001 From: Matt Insko Date: Wed, 10 Feb 2016 13:26:18 -0500 Subject: [PATCH 5/7] Updating to Gradle Plugin 1.5.0. --- app/gradle.properties | 2 +- app/santa-tracker/build.gradle | 2 +- .../PlayGamesBasicSamples/BaseGameUtils/build.gradle | 2 +- app/third_party/volley/volley/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/gradle.properties b/app/gradle.properties index 53faa88c8..26191f456 100644 --- a/app/gradle.properties +++ b/app/gradle.properties @@ -1,7 +1,7 @@ org.gradle.daemon=true #dependencies and versions -androidToolsDependency=com.android.tools.build:gradle:1.0.1 +androidToolsDependency=com.android.tools.build:gradle:1.5.0 toolsVersion=21.1.2 appcompatV7=com.android.support:appcompat-v7:21.0.3 diff --git a/app/santa-tracker/build.gradle b/app/santa-tracker/build.gradle index d27dde0c8..d9d165bc0 100644 --- a/app/santa-tracker/build.gradle +++ b/app/santa-tracker/build.gradle @@ -48,7 +48,7 @@ android { } } lintOptions { - disable 'NewApi' + disable 'NewApi', 'MissingTranslation', 'ExtraTranslation' } } diff --git a/app/third_party/PlayGamesBasicSamples/BaseGameUtils/build.gradle b/app/third_party/PlayGamesBasicSamples/BaseGameUtils/build.gradle index 0af6906e5..4b9dcea89 100644 --- a/app/third_party/PlayGamesBasicSamples/BaseGameUtils/build.gradle +++ b/app/third_party/PlayGamesBasicSamples/BaseGameUtils/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:1.5.0' } } diff --git a/app/third_party/volley/volley/build.gradle b/app/third_party/volley/volley/build.gradle index 24a57107e..9345fa6f7 100644 --- a/app/third_party/volley/volley/build.gradle +++ b/app/third_party/volley/volley/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:1.5.0' } } From 9a8ec30bafb7544c7fdf4bf2558e0864779d3110 Mon Sep 17 00:00:00 2001 From: Matt Insko Date: Thu, 11 Feb 2016 09:39:11 -0500 Subject: [PATCH 6/7] Updating to newest platform and tools. --- app/common/build.gradle | 4 ++-- app/gradle.properties | 12 ++++++------ app/santa-tracker/build.gradle | 5 +++-- app/third_party/volley/volley/build.gradle | 4 ++-- app/village/build.gradle | 6 +++--- app/wearable/build.gradle | 5 +++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/common/build.gradle b/app/common/build.gradle index eb464c3dc..107e251d3 100644 --- a/app/common/build.gradle +++ b/app/common/build.gradle @@ -17,12 +17,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 21 + compileSdkVersion 23 buildToolsVersion toolsVersion defaultConfig { minSdkVersion 15 - targetSdkVersion 21 + targetSdkVersion 23 } lintOptions { disable 'MissingTranslation' diff --git a/app/gradle.properties b/app/gradle.properties index 26191f456..704f7783d 100644 --- a/app/gradle.properties +++ b/app/gradle.properties @@ -2,11 +2,11 @@ org.gradle.daemon=true #dependencies and versions androidToolsDependency=com.android.tools.build:gradle:1.5.0 -toolsVersion=21.1.2 +toolsVersion=23.0.2 -appcompatV7=com.android.support:appcompat-v7:21.0.3 -playServices=com.google.android.gms:play-services:6.5.87 -playServicesWearable=com.google.android.gms:play-services-wearable:6.1.11 -recyclerView=com.android.support:recyclerview-v7:21.0.3 -supportV4=com.android.support:support-v4:21.0.3 +appcompatV7=com.android.support:appcompat-v7:23.1.1 +playServices=com.google.android.gms:play-services:8.4.0 +playServicesWearable=com.google.android.gms:play-services-wearable:8.4.0 +recyclerView=com.android.support:recyclerview-v7:23.1.1 +supportV4=com.android.support:support-v4:23.1.1 wearableSupport=com.google.android.support:wearable:1.1.0 \ No newline at end of file diff --git a/app/santa-tracker/build.gradle b/app/santa-tracker/build.gradle index d9d165bc0..7962deab9 100644 --- a/app/santa-tracker/build.gradle +++ b/app/santa-tracker/build.gradle @@ -17,13 +17,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 + compileSdkVersion 23 buildToolsVersion toolsVersion defaultConfig { applicationId "com.google.android.apps.santatracker" minSdkVersion 15 - targetSdkVersion 21 + targetSdkVersion 23 versionCode 32 versionName "2.1.2" } @@ -43,6 +43,7 @@ android { release { //minifyEnabled true + shrinkResources true //proguardFile 'proguard.txt' signingConfig signingConfigs.standard } diff --git a/app/third_party/volley/volley/build.gradle b/app/third_party/volley/volley/build.gradle index 9345fa6f7..4b19c73fc 100644 --- a/app/third_party/volley/volley/build.gradle +++ b/app/third_party/volley/volley/build.gradle @@ -10,8 +10,8 @@ buildscript { apply plugin: 'android-library' android { - compileSdkVersion 19 - buildToolsVersion = '19.1.0' + compileSdkVersion 23 + buildToolsVersion = '23.0.2' } apply from: 'rules.gradle' diff --git a/app/village/build.gradle b/app/village/build.gradle index feddf6783..4693483c4 100644 --- a/app/village/build.gradle +++ b/app/village/build.gradle @@ -17,15 +17,15 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 21 + compileSdkVersion 23 buildToolsVersion toolsVersion defaultConfig { minSdkVersion 15 - targetSdkVersion 21 + targetSdkVersion 23 } lintOptions { - disable 'NewApi' + disable 'NewApi', 'ResourceType' } } diff --git a/app/wearable/build.gradle b/app/wearable/build.gradle index 2284a0e6a..ef28bebf4 100644 --- a/app/wearable/build.gradle +++ b/app/wearable/build.gradle @@ -17,13 +17,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 + compileSdkVersion 23 buildToolsVersion toolsVersion defaultConfig { applicationId "com.google.android.apps.santatracker" minSdkVersion 20 - targetSdkVersion 21 + targetSdkVersion 23 versionCode 32 versionName "2.1.2" } @@ -44,6 +44,7 @@ android { } release { //minifyEnabled true + shrinkResources true //proguardFile 'proguard-wear.txt' signingConfig signingConfigs.standard } From 3857fed85344cf0e2ac9f0066263a66dca1824c3 Mon Sep 17 00:00:00 2001 From: Matt Insko Date: Thu, 11 Feb 2016 09:40:56 -0500 Subject: [PATCH 7/7] Updating 3rd party to latest platform and fixing compile issues. --- .../BaseGameUtils/build.gradle | 10 ++++----- .../games/basegameutils/BaseGameActivity.java | 11 +++++----- .../games/basegameutils/GameHelper.java | 21 +++---------------- 3 files changed, 13 insertions(+), 29 deletions(-) diff --git a/app/third_party/PlayGamesBasicSamples/BaseGameUtils/build.gradle b/app/third_party/PlayGamesBasicSamples/BaseGameUtils/build.gradle index 4b9dcea89..fe5ebcab5 100644 --- a/app/third_party/PlayGamesBasicSamples/BaseGameUtils/build.gradle +++ b/app/third_party/PlayGamesBasicSamples/BaseGameUtils/build.gradle @@ -28,13 +28,13 @@ buildscript { } dependencies { - compile 'com.android.support:appcompat-v7:21.0.3' - compile 'com.android.support:support-v4:21.0.3' - compile 'com.google.android.gms:play-services:6.5.87' + compile 'com.android.support:appcompat-v7:23.1.1' + compile 'com.android.support:support-v4:23.1.1' + compile 'com.google.android.gms:play-services:8.4.0' } android { - compileSdkVersion 21 - buildToolsVersion '21.1.2' + compileSdkVersion 23 + buildToolsVersion '23.0.2' } diff --git a/app/third_party/PlayGamesBasicSamples/BaseGameUtils/src/main/java/com/google/example/games/basegameutils/BaseGameActivity.java b/app/third_party/PlayGamesBasicSamples/BaseGameUtils/src/main/java/com/google/example/games/basegameutils/BaseGameActivity.java index 1eab7ad60..7cd190230 100644 --- a/app/third_party/PlayGamesBasicSamples/BaseGameUtils/src/main/java/com/google/example/games/basegameutils/BaseGameActivity.java +++ b/app/third_party/PlayGamesBasicSamples/BaseGameUtils/src/main/java/com/google/example/games/basegameutils/BaseGameActivity.java @@ -29,8 +29,8 @@ * override the @link{#onSignInSucceeded} and @link{#onSignInFailed} abstract * methods. To initiate the sign-in flow when the user clicks the sign-in * button, subclasses should call @link{#beginUserInitiatedSignIn}. By default, - * this class only instantiates the GoogleApiClient object. If the PlusClient or - * AppStateClient objects are also wanted, call the BaseGameActivity(int) + * this class only instantiates the GoogleApiClient object. If the PlusClient + * is also wanted, call the BaseGameActivity(int) * constructor and specify the requested clients. For example, to request * PlusClient and GamesClient, use BaseGameActivity(CLIENT_GAMES | CLIENT_PLUS). * To request all available clients, use BaseGameActivity(CLIENT_ALL). @@ -49,7 +49,6 @@ public abstract class BaseGameActivity extends FragmentActivity implements // We expose these constants here because we don't want users of this class // to have to know about GameHelper at all. public static final int CLIENT_GAMES = GameHelper.CLIENT_GAMES; - public static final int CLIENT_APPSTATE = GameHelper.CLIENT_APPSTATE; public static final int CLIENT_PLUS = GameHelper.CLIENT_PLUS; public static final int CLIENT_ALL = GameHelper.CLIENT_ALL; @@ -67,7 +66,7 @@ protected BaseGameActivity() { /** * Constructs a BaseGameActivity with the requested clients. * @param requestedClients The requested clients (a combination of CLIENT_GAMES, - * CLIENT_PLUS and CLIENT_APPSTATE). + * CLIENT_PLUS). */ protected BaseGameActivity(int requestedClients) { super(); @@ -82,7 +81,7 @@ protected BaseGameActivity(int requestedClients) { * is a no-op. * * @param requestedClients A combination of the flags CLIENT_GAMES, CLIENT_PLUS - * and CLIENT_APPSTATE, or CLIENT_ALL to request all available clients. + * or CLIENT_ALL to request all available clients. */ protected void setRequestedClients(int requestedClients) { mRequestedClients = requestedClients; @@ -176,4 +175,4 @@ protected boolean hasSignInError() { protected GameHelper.SignInFailureReason getSignInError() { return mHelper.getSignInError(); } -} +} \ No newline at end of file diff --git a/app/third_party/PlayGamesBasicSamples/BaseGameUtils/src/main/java/com/google/example/games/basegameutils/GameHelper.java b/app/third_party/PlayGamesBasicSamples/BaseGameUtils/src/main/java/com/google/example/games/basegameutils/GameHelper.java index c666cfd8c..a8ca81c10 100644 --- a/app/third_party/PlayGamesBasicSamples/BaseGameUtils/src/main/java/com/google/example/games/basegameutils/GameHelper.java +++ b/app/third_party/PlayGamesBasicSamples/BaseGameUtils/src/main/java/com/google/example/games/basegameutils/GameHelper.java @@ -29,7 +29,6 @@ import android.os.Handler; import android.util.Log; -import com.google.android.gms.appstate.AppStateManager; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.Api.ApiOptions.NoOptions; @@ -114,7 +113,6 @@ public interface GameHelperListener { // Api options to use when adding each API, null for none GamesOptions mGamesApiOptions = GamesOptions.builder().build(); PlusOptions mPlusApiOptions = null; - NoOptions mAppStateApiOptions = null; // Google API client object we manage. GoogleApiClient mGoogleApiClient = null; @@ -123,10 +121,9 @@ public interface GameHelperListener { public final static int CLIENT_NONE = 0x00; public final static int CLIENT_GAMES = 0x01; public final static int CLIENT_PLUS = 0x02; - public final static int CLIENT_APPSTATE = 0x04; public final static int CLIENT_SNAPSHOT = 0x08; public final static int CLIENT_ALL = CLIENT_GAMES | CLIENT_PLUS - | CLIENT_APPSTATE | CLIENT_SNAPSHOT; + | CLIENT_SNAPSHOT; // What clients were requested? (bit flags) int mRequestedClients = CLIENT_NONE; @@ -244,15 +241,6 @@ public void setGamesApiOptions(GamesOptions options) { mGamesApiOptions = options; } - /** - * Sets the options to pass when setting up the AppState API. Call before - * setup(). - */ - public void setAppStateApiOptions(NoOptions options) { - doApiOptionsPreCheck(); - mAppStateApiOptions = options; - } - /** * Sets the options to pass when setting up the Plus API. Call before * setup(). @@ -289,11 +277,6 @@ public GoogleApiClient.Builder createApiClientBuilder() { builder.addScope(Plus.SCOPE_PLUS_LOGIN); } - if (0 != (mRequestedClients & CLIENT_APPSTATE)) { - builder.addApi(AppStateManager.API); - builder.addScope(AppStateManager.SCOPE_APP_STATE); - } - if (0 != (mRequestedClients & CLIENT_SNAPSHOT)) { builder.addScope(Drive.SCOPE_APPFOLDER); builder.addApi(Drive.API); @@ -880,6 +863,8 @@ void resolveConnectionResult() { // error. debugLog("resolveConnectionResult: result has no resolution. Giving up."); giveUp(new SignInFailureReason(mConnectionResult.getErrorCode())); + + mConnectionResult = null; } }