You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@milagro.apache.org by sa...@apache.org on 2016/09/16 10:25:07 UTC
[06/10] incubator-milagro-mfa-sdk-android git commit: Add new network
error codes in Status
Add new network error codes in Status
Update the gradle wrapper to 2.14.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-android/commit/ff6bb04c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-android/tree/ff6bb04c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-android/diff/ff6bb04c
Branch: refs/heads/master
Commit: ff6bb04c2a1a81b61b91b53cc3da7fbd4946616c
Parents: 3e323a0
Author: Vassil Angelov <va...@miracl.com>
Authored: Fri Sep 9 15:51:58 2016 +0300
Committer: Vassil Angelov <va...@miracl.com>
Committed: Fri Sep 9 15:51:58 2016 +0300
----------------------------------------------------------------------
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.properties | 4 ++--
mpin-sdk-core | 2 +-
mpinsdk/src/main/java/com/miracl/mpinsdk/model/Status.java | 5 +++--
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-android/blob/ff6bb04c/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index a291823..eb2384a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-VERSION_NAME=1.2-SNAPSHOT
+VERSION_NAME=1.3-SNAPSHOT
GROUP=com.miracl
RELEASE_REPOSITORY_URL=http://10.10.23.15:8081/content/repositories/mpinsdk/
SNAPSHOT_REPOSITORY_URL=http://10.10.23.15:8081/content/repositories/mpinsdk-snapshot/
http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-android/blob/ff6bb04c/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 330e95a..fef85ea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Fri Sep 09 15:34:14 EEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-android/blob/ff6bb04c/mpin-sdk-core
----------------------------------------------------------------------
diff --git a/mpin-sdk-core b/mpin-sdk-core
index a17c6b3..e631fb2 160000
--- a/mpin-sdk-core
+++ b/mpin-sdk-core
@@ -1 +1 @@
-Subproject commit a17c6b3d45aa2e952fa499dca5d193467d485486
+Subproject commit e631fb2db35485114e6628abee12a28989e35cff
http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-android/blob/ff6bb04c/mpinsdk/src/main/java/com/miracl/mpinsdk/model/Status.java
----------------------------------------------------------------------
diff --git a/mpinsdk/src/main/java/com/miracl/mpinsdk/model/Status.java b/mpinsdk/src/main/java/com/miracl/mpinsdk/model/Status.java
index 4d2bb52..de9a477 100644
--- a/mpinsdk/src/main/java/com/miracl/mpinsdk/model/Status.java
+++ b/mpinsdk/src/main/java/com/miracl/mpinsdk/model/Status.java
@@ -67,8 +67,9 @@ public class Status implements Serializable {
INCORRECT_ACCESS_NUMBER, // Remote/local error - wrong access number (checksum failed or RPS returned 412)
HTTP_SERVER_ERROR, // Remote error, that was not reduced to one of the above - the remote server returned
// internal server error status (5xx)
- HTTP_REQUEST_ERROR // Remote error, that was not reduced to one of the above - invalid data sent to server, the
+ HTTP_REQUEST_ERROR, // Remote error, that was not reduced to one of the above - invalid data sent to server, the
// remote server returned 4xx error status
+ BAD_USER_AGENT, // Remote error - user agent not supported
+ CLIENT_SECRET_EXPIRED // Remote error - re-registration required because server master secret expired
}
-
}