From aa35792a2fbcf283fcc433f1416dea682e10fb87 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 18 Dec 2017 16:17:32 -0300 Subject: [PATCH 1/3] 9.0 / 502 version bump --- WordPress/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 75d27c90acc1..1b75e4be188d 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -37,8 +37,8 @@ android { defaultConfig { applicationId "org.wordpress.android" - versionName "9.0-rc-1" - versionCode 500 + versionName "9.0" + versionCode 502 minSdkVersion 16 targetSdkVersion 25 From 16fc38f7ed35a9080b5fb2ea2e06da2b62f06a28 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Tue, 19 Dec 2017 15:24:45 +0200 Subject: [PATCH 2/3] Cover the missing case --- .../wordpress/android/ui/accounts/login/LoginWpcomService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginWpcomService.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginWpcomService.java index 67a888d56554..602794295353 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginWpcomService.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginWpcomService.java @@ -154,6 +154,7 @@ public boolean isError() { public Notification getNotification() { switch (mLoginPhase) { case AUTHENTICATING: + case SOCIAL_LOGIN: case FETCHING_ACCOUNT: case FETCHING_SETTINGS: case FETCHING_SITES: From 7c8bd20c2d74f5a4dcde015387355dccc539086a Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 19 Dec 2017 10:37:39 -0300 Subject: [PATCH 3/3] 9.0 / 505 version bump --- WordPress/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 1b75e4be188d..8fc9f9c1f8ed 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -38,7 +38,7 @@ android { defaultConfig { applicationId "org.wordpress.android" versionName "9.0" - versionCode 502 + versionCode 505 minSdkVersion 16 targetSdkVersion 25