From 425e5dbde5bc24174c37540236a187da2351a4ad Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Tue, 13 Sep 2016 22:23:01 +0200
Subject: [PATCH 01/48] Updated Android Support library

---
 SWADroid/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index f8cf6c554..31c824868 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -56,8 +56,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:24.2.0'
-    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile 'com.android.support:support-v4:24.2.1'
+    compile 'com.android.support:appcompat-v7:24.2.1'
     compile 'com.google.android.gms:play-services-analytics:9.4.0'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.1'
     compile 'commons-io:commons-io:2.5'

From c98242e6e7c74d28233e4a91c45e7a47b19c726b Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Mon, 19 Sep 2016 20:13:02 +0200
Subject: [PATCH 02/48] Updated Gradle plugin

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e7ff91194..07a513831 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'org.ajoberstar:grgit:1.7.0'
     }
 }

From 044e9a55634a3bbc0d59dbbcce334d42e51570cf Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 22 Sep 2016 22:02:58 +0200
Subject: [PATCH 03/48] Updated Analytics library

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 31c824868..eec0676df 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -58,7 +58,7 @@ android {
 dependencies {
     compile 'com.android.support:support-v4:24.2.1'
     compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.google.android.gms:play-services-analytics:9.4.0'
+    compile 'com.google.android.gms:play-services-analytics:9.6.0'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.1'
     compile 'commons-io:commons-io:2.5'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'

From 938597b845656ef893b4528d596548da3f7cc9ae Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Wed, 28 Sep 2016 19:55:12 +0200
Subject: [PATCH 04/48] Updated Analytics library

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index eec0676df..1314a9acc 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -58,7 +58,7 @@ android {
 dependencies {
     compile 'com.android.support:support-v4:24.2.1'
     compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.google.android.gms:play-services-analytics:9.6.0'
+    compile 'com.google.android.gms:play-services-analytics:9.6.1'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.1'
     compile 'commons-io:commons-io:2.5'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'

From 8c4782ab73a54d0a2c7294e6658fa3116c7e2727 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Wed, 28 Sep 2016 23:16:32 +0200
Subject: [PATCH 05/48] Replaced NULL value for strings returned by the
 webservice with the empty string

---
 .../modules/rollcall/UsersCursorAdapter.java       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersCursorAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersCursorAdapter.java
index 43d591ef7..927e91cca 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersCursorAdapter.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersCursorAdapter.java
@@ -32,6 +32,7 @@
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 
+import es.ugr.swad.swadroid.Constants;
 import es.ugr.swad.swadroid.R;
 import es.ugr.swad.swadroid.database.DataBaseHelper;
 import es.ugr.swad.swadroid.gui.ImageFactory;
@@ -110,6 +111,19 @@ public void bindView(View view, Context context, Cursor cursor) {
         String userPhoto = cursor.getString(cursor.getColumnIndex("photoPath"));
         boolean present = Utils.parseIntBool(cursor.getInt(cursor.getColumnIndex("present")));
 
+        // Replace NULL value for strings returned by the webservice with the empty string
+        if (userSurname1.equals(Constants.NULL_VALUE))
+            userSurname1 = "";
+
+        if (userSurname2.equals(Constants.NULL_VALUE))
+            userSurname2 = "";
+
+        if (userFirstname.equals(Constants.NULL_VALUE))
+            userFirstname = "";
+
+        if (userID.equals(Constants.NULL_VALUE))
+            userID = "";
+
         final ViewHolder holder = (ViewHolder) view.getTag();
         view.setTag(holder);
 

From 284c3aa280f0680da1b4ecb64dcfaa8934b83ae4 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Wed, 28 Sep 2016 23:22:33 +0200
Subject: [PATCH 06/48] Hided action bar on codes scanner

---
 .../swadroid/modules/rollcall/ContinuousCaptureActivity.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/ContinuousCaptureActivity.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/ContinuousCaptureActivity.java
index 54898a346..fa80af081 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/ContinuousCaptureActivity.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/ContinuousCaptureActivity.java
@@ -97,6 +97,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.continuous_scan);
 
+        getSupportActionBar().hide();
+
         try {
             //Initialize database
             dbHelper = new DataBaseHelper(this);

From ae1657049195152ba39232599dbc9d007a45e71a Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 20:33:53 +0200
Subject: [PATCH 07/48] Enabled CI through Travis-CI

---
 SWADroid/build.gradle                         | 22 ++++++++++++
 .../main/java/es/ugr/swad/swadroid/.gitignore |  1 -
 .../java/es/ugr/swad/swadroid/Config.java     | 35 +++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)
 delete mode 100644 SWADroid/src/main/java/es/ugr/swad/swadroid/.gitignore
 create mode 100644 SWADroid/src/main/java/es/ugr/swad/swadroid/Config.java

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 1314a9acc..251ff0309 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -4,6 +4,8 @@ ext {
     git = org.ajoberstar.grgit.Grgit.open()
     gitVersionCode = git.tag.list().size()
     gitVersionName = "${git.describe()}"
+
+    travisBuild = System.getenv("TRAVIS") == "true"
 }
 
 android {
@@ -52,7 +54,27 @@ android {
         debug {
             versionNameSuffix '-DEBUG'
         }
+
+        buildTypes.each {
+            it.buildConfigField "String", "SWAD_APP_KEY", getBuildConfigField("SWAD_APP_KEY")
+            it.buildConfigField "String", "ANALYTICS_API_KEY", getBuildConfigField("ANALYTICS_API_KEY")
+        }
+    }
+}
+
+//return a BuildConfigField from a properties file.
+def getBuildConfigField(String property){
+    String value;
+
+    if(travisBuild) {
+        value = System.getenv(property)
+    } else {
+        Properties properties = new Properties()
+        properties.load(new FileInputStream("keystore.properties"))
+        value = "\"" + properties.getProperty(property) + "\""
     }
+
+    return value
 }
 
 dependencies {
diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/.gitignore b/SWADroid/src/main/java/es/ugr/swad/swadroid/.gitignore
deleted file mode 100644
index 00e2c3f41..000000000
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Config.java
diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/Config.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/Config.java
new file mode 100644
index 000000000..5752c00f4
--- /dev/null
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/Config.java
@@ -0,0 +1,35 @@
+/*
+ *  This file is part of SWADroid.
+ *
+ *  Copyright (C) 2010 Juan Miguel Boyero Corral <juanmi1982@gmail.com>
+ *
+ *  SWADroid is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  SWADroid is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with SWADroid.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package es.ugr.swad.swadroid;
+
+/**
+ * Application settings.
+ * 
+ * @author Juan Miguel Boyero Corral <juanmi1982@gmail.com>
+ */
+public class Config {
+	/**
+	 * SWAD application key
+	 */
+	public static final String SWAD_APP_KEY = BuildConfig.SWAD_APP_KEY;
+    /**
+     * Google Analytics application key
+     */
+    public static final String ANALYTICS_API_KEY = BuildConfig.ANALYTICS_API_KEY;
+}

From 9d3addda9d4752ae15a9c040c796cddc0f973b83 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 20:35:34 +0200
Subject: [PATCH 08/48] Enabled CI through Travis-CI

---
 .gitignore  |   3 +-
 .travis.yml |  18 ++++++
 gradlew     | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 gradlew.bat |  90 ++++++++++++++++++++++++++++
 4 files changed, 273 insertions(+), 2 deletions(-)
 create mode 100644 .travis.yml
 create mode 100644 gradlew
 create mode 100644 gradlew.bat

diff --git a/.gitignore b/.gitignore
index 1922c65fe..e1c2a35f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,10 @@
 .idea
 .gradle
 build
-gradlew
-gradlew.bat
 import-summary.txt
 local.properties
 /SWADroid/SWADroid-SWADroid.iml
 /SWADroid.iml
 app/lint.xml
 /SWADroid/google-services.json
+/keystore.properties
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..3ff6ca083
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+language: android
+android:
+  components:
+  - tools
+  - tools
+  - platform-tools
+  - build-tools-24.0.2
+  - android-24
+  - extra-android-support
+  - extra-google-google_play_services
+script:
+- "./gradlew build connectedCheck"
+env:
+  global:
+    #SWAD_APP_KEY
+  - secure: qmkwdeZeZufS57yoXqeFD1WSXfCm8rdMEsjU1A44BVfklJikFdrc6ejqTzh4Kd56KhATYFT5cQmjJosT2QEf2hBQ77eLMAxEv+9XNioA7C8IHpHNnGx08egZBnwNM2uSr23MSws45+UAcVI1yDnpfBxD+IXFKS6Ms/ltd0/NYvjMhdTLF7ZOA6SX5uM8+o2F2SnhBOxsrdMOO3cK6mgI1eRoyqZKvL0fE+nE3ilTEX0TpReXsQtfA62EGi15Y2STbO7E0Yot7liFrF5FWrk/5C54nF581Aq2O69SVdVwVzENn3eHf2lbMdyCj8+arkBG19HZjYaUOHBDgvFudn/O03Ep2HR5h55Lj6Ns72lRxhPI84Lf6gP5l5sKEkkRB953ovTeYJ+WkbjcCFoSUp+dDVtUsIuiF2gzldtTc6KyEcCbxSgGzUIImRpbv60NvRkRXItgRmWvGdtCltAkn8160ITWNS3wFAZMWwk+NL1t+J6Q5YXJCOM4ldkTCHVtWnK73xK30wIPZm7Z9YIuBtaaLlNdDSZuk5qpxee2sfdx4VmE4AwapJt4GxPkyuJWUfX4tn/qbavR5zdYL8RkIAwkFq0WktebbsZqJCXEPTTWVprP3gv5sDIOgRxmGQC71fZf70jdUwLapmxPJxLbTFl5rRtevcbeommN3qWt1HKX/t8=
+    #ANALYTICS_APP_KEY
+  - secure: KKBRF69oXeRxfKcG10LG43PR0Ig3KIAAtyK5HvwP6J/OdiihzMRsdikaSRA4cDj/FjhQZGjU2ktMApbjtr5Qd6GjrLf3QRNZ+0ntuiAj7dfcaDf9HWZEvgQyco4xRbXcmQV7uM3g624Yf+8Cl5vSsuF20XJssq9C4hqinzNm5/suGO8BtALpzsy0mDtOQ6Q2b/2rGmwzp6TIuJEXKZlNELrr04lLZjWiBxbAONSXwEt1lhJiXVp4ovvfV9l0OQoBBEdON5CaviqZblB3Br3Lsw87MC993b6+1Ve7ac8aGic0IAHWWnOmUCRYhiMReuzgfsJIdsaysN4I9kALJOmHHxYraKOC1GgfM14/DVTZrwtyqorJeiXzi44208bEPfLsPv6SVOkIo0EfpDckoI2jfrfP30trOm6t8HLdY94a+9kyR0+uivLj39e+eDRRXkJ2zeluF4tejW/8R3y4wqXzJzSu+O1UCN5o+7o0SPR4UtXhvJYOURGpXORbN9IfYcbjkK7BcTPyAKOFPbGh7EYLJyLKlM1cD7BL0lW8eAkAeukZjLNrEiOE+tCLJL7205423UhCkBYuDLPE0eHerdovX7SypTSICmQX89WovrNle6/hACq7ndjJoNMDW5+pEugHDJDEXZPYlaRBYvVTZRXRTstBsRBQnGvOLhTxLj/LTVU=
diff --git a/gradlew b/gradlew
new file mode 100644
index 000000000..91a7e269e
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 000000000..8a0b282aa
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

From 70a14ce4ce87470518132379a4afb8be949ea2a7 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 20:42:26 +0200
Subject: [PATCH 09/48] Added exec permission to gradlew

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e1c2a35f4..a000de9dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ local.properties
 /SWADroid.iml
 app/lint.xml
 /SWADroid/google-services.json
-/keystore.properties
+keystore.properties

From e57e0bce265ea137a25ab04c7dddaede1dce9259 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 20:43:09 +0200
Subject: [PATCH 10/48] Added exec permission to gradlew

---
 .travis.yml         | 2 ++
 keystore.properties | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 keystore.properties

diff --git a/.travis.yml b/.travis.yml
index 3ff6ca083..c3c435e57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,3 +16,5 @@ env:
   - secure: qmkwdeZeZufS57yoXqeFD1WSXfCm8rdMEsjU1A44BVfklJikFdrc6ejqTzh4Kd56KhATYFT5cQmjJosT2QEf2hBQ77eLMAxEv+9XNioA7C8IHpHNnGx08egZBnwNM2uSr23MSws45+UAcVI1yDnpfBxD+IXFKS6Ms/ltd0/NYvjMhdTLF7ZOA6SX5uM8+o2F2SnhBOxsrdMOO3cK6mgI1eRoyqZKvL0fE+nE3ilTEX0TpReXsQtfA62EGi15Y2STbO7E0Yot7liFrF5FWrk/5C54nF581Aq2O69SVdVwVzENn3eHf2lbMdyCj8+arkBG19HZjYaUOHBDgvFudn/O03Ep2HR5h55Lj6Ns72lRxhPI84Lf6gP5l5sKEkkRB953ovTeYJ+WkbjcCFoSUp+dDVtUsIuiF2gzldtTc6KyEcCbxSgGzUIImRpbv60NvRkRXItgRmWvGdtCltAkn8160ITWNS3wFAZMWwk+NL1t+J6Q5YXJCOM4ldkTCHVtWnK73xK30wIPZm7Z9YIuBtaaLlNdDSZuk5qpxee2sfdx4VmE4AwapJt4GxPkyuJWUfX4tn/qbavR5zdYL8RkIAwkFq0WktebbsZqJCXEPTTWVprP3gv5sDIOgRxmGQC71fZf70jdUwLapmxPJxLbTFl5rRtevcbeommN3qWt1HKX/t8=
     #ANALYTICS_APP_KEY
   - secure: KKBRF69oXeRxfKcG10LG43PR0Ig3KIAAtyK5HvwP6J/OdiihzMRsdikaSRA4cDj/FjhQZGjU2ktMApbjtr5Qd6GjrLf3QRNZ+0ntuiAj7dfcaDf9HWZEvgQyco4xRbXcmQV7uM3g624Yf+8Cl5vSsuF20XJssq9C4hqinzNm5/suGO8BtALpzsy0mDtOQ6Q2b/2rGmwzp6TIuJEXKZlNELrr04lLZjWiBxbAONSXwEt1lhJiXVp4ovvfV9l0OQoBBEdON5CaviqZblB3Br3Lsw87MC993b6+1Ve7ac8aGic0IAHWWnOmUCRYhiMReuzgfsJIdsaysN4I9kALJOmHHxYraKOC1GgfM14/DVTZrwtyqorJeiXzi44208bEPfLsPv6SVOkIo0EfpDckoI2jfrfP30trOm6t8HLdY94a+9kyR0+uivLj39e+eDRRXkJ2zeluF4tejW/8R3y4wqXzJzSu+O1UCN5o+7o0SPR4UtXhvJYOURGpXORbN9IfYcbjkK7BcTPyAKOFPbGh7EYLJyLKlM1cD7BL0lW8eAkAeukZjLNrEiOE+tCLJL7205423UhCkBYuDLPE0eHerdovX7SypTSICmQX89WovrNle6/hACq7ndjJoNMDW5+pEugHDJDEXZPYlaRBYvVTZRXRTstBsRBQnGvOLhTxLj/LTVU=
+before_install:
+ - chmod +x gradlew
\ No newline at end of file
diff --git a/keystore.properties b/keystore.properties
new file mode 100644
index 000000000..0d873d7ab
--- /dev/null
+++ b/keystore.properties
@@ -0,0 +1,2 @@
+SWAD_APP_KEY=HTC-Desire
+ANALYTICS_API_KEY=UA-55011770-1
\ No newline at end of file

From 28cdaf7424f3a33402075045eb440276c956712c Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 20:48:41 +0200
Subject: [PATCH 11/48] Setted JDK 8 version in Travis CI settings

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c3c435e57..007874b1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: android
+jdk:
+  - oraclejdk8
 android:
   components:
   - tools

From 390c562a40bdccd96dd0f555f71de08ffe80989c Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 21:02:40 +0200
Subject: [PATCH 12/48] Added licenses to Travis CI settings

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 007874b1e..3b5849f10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,13 @@ android:
   - platform-tools
   - build-tools-24.0.2
   - android-24
+  - extra-android-m2repository
   - extra-android-support
   - extra-google-google_play_services
+licenses:
+    - android-sdk-license-c81a61d9
+    - android-sdk-license-.+
+    - google-gdk-license-.+
 script:
 - "./gradlew build connectedCheck"
 env:

From abc0997f0c0feffe4a27e9ba11ac6e2c8610cfb6 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 21:05:38 +0200
Subject: [PATCH 13/48] Updated licenses to Travis CI settings

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3b5849f10..c640991e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ android:
   - extra-android-support
   - extra-google-google_play_services
 licenses:
-    - android-sdk-license-c81a61d9
     - android-sdk-license-.+
     - google-gdk-license-.+
 script:

From 2d7b4cf4b38986cee825f268f173268223f35660 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 21:14:22 +0200
Subject: [PATCH 14/48] Updated Travis CI settings

---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c640991e6..d211df935 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,7 @@ android:
   - build-tools-24.0.2
   - android-24
   - extra-android-m2repository
-  - extra-android-support
-  - extra-google-google_play_services
-licenses:
-    - android-sdk-license-.+
-    - google-gdk-license-.+
+  - extra-google-m2repository
 script:
 - "./gradlew build connectedCheck"
 env:

From 17dfe871ea5d6b345ad5aede243e419f15b6ca41 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 21:16:16 +0200
Subject: [PATCH 15/48] Updated Travis CI settings

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d211df935..7586ae565 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,9 @@ android:
   - build-tools-24.0.2
   - android-24
   - extra-android-m2repository
+  - extra-android-support
   - extra-google-m2repository
+  - extra-google-google_play_services
 script:
 - "./gradlew build connectedCheck"
 env:

From 6249a348f2e7ac55952d398e923b739e2d04d1a2 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 21:24:07 +0200
Subject: [PATCH 16/48] Added CI status to README

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index c7fb288b6..9bebeaaf8 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,12 @@ Android client for e-learning platform [![SWADroid](https://openswad.org/logo/sw
 
 [![SWADroid](http://upload.wikimedia.org/wikipedia/commons/c/c8/Farm-Fresh_twitter_1.png)](http://twitter.com/SWADroid)[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/4/4d/Farm-Fresh_facebook.png)](https://www.facebook.com/SWADroid)[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/b/ba/Google_plus_32.png)](https://plus.google.com/115615684349730524355/posts)[![SWADroid](https://s.w.org/about/images/logos/wordpress-logo-32-blue.png)](http://swadroid.wordpress.com)
 
+CI Status
+---------
+
+- **develop:** [![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=feature%2Fdevelop)
+- **master:** [![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=feature%2Fmaster)
+
 Copyright and License
 ---------------------
 

From e7b7e56ae7c36e97501f06bcea949e98245dbd2f Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 21:31:02 +0200
Subject: [PATCH 17/48] Fixed encrypted API keys in Travis CI settings

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7586ae565..36a6a8ce6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: android
 jdk:
-  - oraclejdk8
+- oraclejdk8
 android:
   components:
   - tools
@@ -17,8 +17,8 @@ script:
 env:
   global:
     #SWAD_APP_KEY
-  - secure: qmkwdeZeZufS57yoXqeFD1WSXfCm8rdMEsjU1A44BVfklJikFdrc6ejqTzh4Kd56KhATYFT5cQmjJosT2QEf2hBQ77eLMAxEv+9XNioA7C8IHpHNnGx08egZBnwNM2uSr23MSws45+UAcVI1yDnpfBxD+IXFKS6Ms/ltd0/NYvjMhdTLF7ZOA6SX5uM8+o2F2SnhBOxsrdMOO3cK6mgI1eRoyqZKvL0fE+nE3ilTEX0TpReXsQtfA62EGi15Y2STbO7E0Yot7liFrF5FWrk/5C54nF581Aq2O69SVdVwVzENn3eHf2lbMdyCj8+arkBG19HZjYaUOHBDgvFudn/O03Ep2HR5h55Lj6Ns72lRxhPI84Lf6gP5l5sKEkkRB953ovTeYJ+WkbjcCFoSUp+dDVtUsIuiF2gzldtTc6KyEcCbxSgGzUIImRpbv60NvRkRXItgRmWvGdtCltAkn8160ITWNS3wFAZMWwk+NL1t+J6Q5YXJCOM4ldkTCHVtWnK73xK30wIPZm7Z9YIuBtaaLlNdDSZuk5qpxee2sfdx4VmE4AwapJt4GxPkyuJWUfX4tn/qbavR5zdYL8RkIAwkFq0WktebbsZqJCXEPTTWVprP3gv5sDIOgRxmGQC71fZf70jdUwLapmxPJxLbTFl5rRtevcbeommN3qWt1HKX/t8=
+  - secure: CBH/rpdOvSnmcG3oElpUVFXEFkV1tOnL7ZDAVQcVmb7Volhbp2xbzH98kBob3Zt7ZknlkZ4vzpEwHb11lUDZK8igMgsL/ZcORPURZ4549a1SJL8kG587QLcQ6SZA//7z1B6KraMaEC5jOaP2tA3B7uEmrhE+lXJLvDOPOjJxvQtCOBtIdOIR6TcugcA12XGgDl9cgsF8kvS0iTltJrKkhwpJtZAvHbmG+7sgKn8vwhv7gMYIHwMH+jfHT4Pd1VEhU0kjGNlHThOUWD2KQSZF4XGqwVpD+dT29aOXw74cAhlYo2xPvrs4a48fdJKktDXGZdvEqXNCXBLW7Di7WQyJLMUwjcgapVZSemPyCCWW9kWIle9K3Hb9c4JgjwjvdS5QLA+bNOSmMPYzUSRh/W/LyH/C7ft2z16dEPgpmOANg1rcgMTjtvGyZGVpNuWUq/bCBwKSYvy4EgEaE8E6zBAM92iNrDrJopIFctSISjYmGUazVROpvR62t85qS6bt/U9hkfHQOz/SI+ltrxkii2q4g3Vy4PqaTdGYgQCeYlXjIgrtuLwysWmJi04kLHd+uuRHGbm3jrAaHgeQxg8Gf9NFb5mK5Wgcjw0NnR82I2cWnaBs48IPzUALDLPE+xnepVZ9fHY2UL1+wCqZUxzA6IiAdxLgmKRjyxbJnHRHwgVShzI=
     #ANALYTICS_APP_KEY
-  - secure: KKBRF69oXeRxfKcG10LG43PR0Ig3KIAAtyK5HvwP6J/OdiihzMRsdikaSRA4cDj/FjhQZGjU2ktMApbjtr5Qd6GjrLf3QRNZ+0ntuiAj7dfcaDf9HWZEvgQyco4xRbXcmQV7uM3g624Yf+8Cl5vSsuF20XJssq9C4hqinzNm5/suGO8BtALpzsy0mDtOQ6Q2b/2rGmwzp6TIuJEXKZlNELrr04lLZjWiBxbAONSXwEt1lhJiXVp4ovvfV9l0OQoBBEdON5CaviqZblB3Br3Lsw87MC993b6+1Ve7ac8aGic0IAHWWnOmUCRYhiMReuzgfsJIdsaysN4I9kALJOmHHxYraKOC1GgfM14/DVTZrwtyqorJeiXzi44208bEPfLsPv6SVOkIo0EfpDckoI2jfrfP30trOm6t8HLdY94a+9kyR0+uivLj39e+eDRRXkJ2zeluF4tejW/8R3y4wqXzJzSu+O1UCN5o+7o0SPR4UtXhvJYOURGpXORbN9IfYcbjkK7BcTPyAKOFPbGh7EYLJyLKlM1cD7BL0lW8eAkAeukZjLNrEiOE+tCLJL7205423UhCkBYuDLPE0eHerdovX7SypTSICmQX89WovrNle6/hACq7ndjJoNMDW5+pEugHDJDEXZPYlaRBYvVTZRXRTstBsRBQnGvOLhTxLj/LTVU=
+  - secure: RSSmGmB+QshNkSLyWQe3YnzwCJSXtOX6foHeKsGlR1cJ40V9gQus4hSUTuS68xK738+c7+8/nNNibV0vMhR38+RAt5IIQSStvwBDKCDinFmKiz3SakCBd5NqGqRCekz+QeXZnCvwDK5xsnJXBOZ4gSVAIN5OQtX6+rQMXC1ydufzRXNM77V4pGG7wavf+4nqX0tDTzhf3RreV0sJGmBb2i/1CnRmgjwLwWqYLXqHWNanAtIPYnibhF2mFlgzd9Vnzkf3fZnRoBmQssjNhE/kv7r7uBF/1U5Y8PVSAqdgsd0NMc8QQDhZK8HKkBK/RRNwnPpD82bs8mWyaK62PM7fewTf5odViFxeA9qPw02RiCtHpAyBmIoxDKImXKimnr9/AAx3OrG0pW25b4AAi0SsyJl4px8TibsZwy3tDv9uGzKAvhCVG+fRMiWnQOnXXdw9+waIDgdk1ysj48ndtrXaEdcgGegOfzeya6OXfwsitwfynfvp29zbfNwQxhtVmUcF0rvOaGuNdGHaaGUOW5f3gToSrsbABVOpBcxcyzL6N9/tsOyJNZe5yiYqIEv89Qim2iHnOGMZDQiSHVtkpKqk1opWx5IqcBv1nt2a7pR0q3nYSwXaZpBoT05KJZ1yJsW+Sonebqfd2PO2Z0OgK6v0S7nuI3EoXP2gQ5qY4zk4iGo=
 before_install:
- - chmod +x gradlew
\ No newline at end of file
+- chmod +x gradlew

From 52dd79d3a9ad09a2064d0aa1f7a774a41e464e0f Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 21:34:10 +0200
Subject: [PATCH 18/48] Updated README

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9bebeaaf8..8d24bdba5 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,10 @@ Android client for e-learning platform [![SWADroid](https://openswad.org/logo/sw
 CI Status
 ---------
 
-- **develop:** [![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=feature%2Fdevelop)
-- **master:** [![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=feature%2Fmaster)
+|Branch|CI status|
+|------|---------|
+|develop|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=feature%2Fdevelop)|
+|master|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=feature%2Fmaster)|
 
 Copyright and License
 ---------------------

From 92fb1f238634198ad24c56fb276dc1edb9045e5e Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 21:36:46 +0200
Subject: [PATCH 19/48] Updated README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8d24bdba5..2586f6912 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ CI Status
 
 |Branch|CI status|
 |------|---------|
-|develop|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=feature%2Fdevelop)|
-|master|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=feature%2Fmaster)|
+|develop|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=develop)|
+|master|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=master)|
 
 Copyright and License
 ---------------------

From cc06926ffa19dbb66d63aab01d33a80ff3522f0e Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 21:38:28 +0200
Subject: [PATCH 20/48] Updated README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2586f6912..54ff3a362 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ CI Status
 
 |Branch|CI status|
 |------|---------|
-|develop|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=develop)|
-|master|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=master)|
+|develop|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg?branch=develop)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=develop)|
+|master|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg?branch=master)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=master)|
 
 Copyright and License
 ---------------------

From 976ef1c9ba7c6e3c411cdd0af10ed3bf7c6a3c52 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 23:12:20 +0200
Subject: [PATCH 21/48] Added Telegram channel to README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 54ff3a362..141f78057 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Android client for e-learning platform [![SWADroid](https://openswad.org/logo/sw
 -	Code: `git clone https://github.com/Amab/SWADroid.git`
 -	Issue tracker: https://github.com/Amab/SWADroid/issues
 
-[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/c/c8/Farm-Fresh_twitter_1.png)](http://twitter.com/SWADroid)[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/4/4d/Farm-Fresh_facebook.png)](https://www.facebook.com/SWADroid)[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/b/ba/Google_plus_32.png)](https://plus.google.com/115615684349730524355/posts)[![SWADroid](https://s.w.org/about/images/logos/wordpress-logo-32-blue.png)](http://swadroid.wordpress.com)
+[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/c/c8/Farm-Fresh_twitter_1.png)](http://twitter.com/SWADroid)[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/4/4d/Farm-Fresh_facebook.png)](https://www.facebook.com/SWADroid)[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/b/ba/Google_plus_32.png)](https://plus.google.com/115615684349730524355/posts)[![SWADroid](https://upload.wikimedia.org/wikipedia/commons/thumb/5/5c/Telegram_Messenger.png/35px-Telegram_Messenger.png?uselang=es)](https://telegram.me/swadroid)[![SWADroid](https://s.w.org/about/images/logos/wordpress-logo-32-blue.png)](http://swadroid.wordpress.com)
 
 CI Status
 ---------

From b1711b862bd65beed4d1a01b8d671a1d48f73d01 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 23:21:31 +0200
Subject: [PATCH 22/48] Removed encrypted data from Travis CI settings

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 36a6a8ce6..4a2b92a97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,5 @@ android:
   - extra-google-google_play_services
 script:
 - "./gradlew build connectedCheck"
-env:
-  global:
-    #SWAD_APP_KEY
-  - secure: CBH/rpdOvSnmcG3oElpUVFXEFkV1tOnL7ZDAVQcVmb7Volhbp2xbzH98kBob3Zt7ZknlkZ4vzpEwHb11lUDZK8igMgsL/ZcORPURZ4549a1SJL8kG587QLcQ6SZA//7z1B6KraMaEC5jOaP2tA3B7uEmrhE+lXJLvDOPOjJxvQtCOBtIdOIR6TcugcA12XGgDl9cgsF8kvS0iTltJrKkhwpJtZAvHbmG+7sgKn8vwhv7gMYIHwMH+jfHT4Pd1VEhU0kjGNlHThOUWD2KQSZF4XGqwVpD+dT29aOXw74cAhlYo2xPvrs4a48fdJKktDXGZdvEqXNCXBLW7Di7WQyJLMUwjcgapVZSemPyCCWW9kWIle9K3Hb9c4JgjwjvdS5QLA+bNOSmMPYzUSRh/W/LyH/C7ft2z16dEPgpmOANg1rcgMTjtvGyZGVpNuWUq/bCBwKSYvy4EgEaE8E6zBAM92iNrDrJopIFctSISjYmGUazVROpvR62t85qS6bt/U9hkfHQOz/SI+ltrxkii2q4g3Vy4PqaTdGYgQCeYlXjIgrtuLwysWmJi04kLHd+uuRHGbm3jrAaHgeQxg8Gf9NFb5mK5Wgcjw0NnR82I2cWnaBs48IPzUALDLPE+xnepVZ9fHY2UL1+wCqZUxzA6IiAdxLgmKRjyxbJnHRHwgVShzI=
-    #ANALYTICS_APP_KEY
-  - secure: RSSmGmB+QshNkSLyWQe3YnzwCJSXtOX6foHeKsGlR1cJ40V9gQus4hSUTuS68xK738+c7+8/nNNibV0vMhR38+RAt5IIQSStvwBDKCDinFmKiz3SakCBd5NqGqRCekz+QeXZnCvwDK5xsnJXBOZ4gSVAIN5OQtX6+rQMXC1ydufzRXNM77V4pGG7wavf+4nqX0tDTzhf3RreV0sJGmBb2i/1CnRmgjwLwWqYLXqHWNanAtIPYnibhF2mFlgzd9Vnzkf3fZnRoBmQssjNhE/kv7r7uBF/1U5Y8PVSAqdgsd0NMc8QQDhZK8HKkBK/RRNwnPpD82bs8mWyaK62PM7fewTf5odViFxeA9qPw02RiCtHpAyBmIoxDKImXKimnr9/AAx3OrG0pW25b4AAi0SsyJl4px8TibsZwy3tDv9uGzKAvhCVG+fRMiWnQOnXXdw9+waIDgdk1ysj48ndtrXaEdcgGegOfzeya6OXfwsitwfynfvp29zbfNwQxhtVmUcF0rvOaGuNdGHaaGUOW5f3gToSrsbABVOpBcxcyzL6N9/tsOyJNZe5yiYqIEv89Qim2iHnOGMZDQiSHVtkpKqk1opWx5IqcBv1nt2a7pR0q3nYSwXaZpBoT05KJZ1yJsW+Sonebqfd2PO2Z0OgK6v0S7nuI3EoXP2gQ5qY4zk4iGo=
 before_install:
 - chmod +x gradlew

From 8f57858587c1883fefd587233519c6d622672cbf Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 29 Sep 2016 23:32:39 +0200
Subject: [PATCH 23/48] Removed properties

---
 keystore.properties | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 keystore.properties

diff --git a/keystore.properties b/keystore.properties
deleted file mode 100644
index 0d873d7ab..000000000
--- a/keystore.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-SWAD_APP_KEY=HTC-Desire
-ANALYTICS_API_KEY=UA-55011770-1
\ No newline at end of file

From 2c4a6e45efd7ad01ac892fbd61d697b57a0d6e7e Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 30 Sep 2016 00:03:02 +0200
Subject: [PATCH 24/48] Fixed typo in Gradle script

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 251ff0309..936d7a88e 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -64,7 +64,7 @@ android {
 
 //return a BuildConfigField from a properties file.
 def getBuildConfigField(String property){
-    String value;
+    String value
 
     if(travisBuild) {
         value = System.getenv(property)

From 7ebf58a58cb3137f0c4f4fcd35dc2fcad2e49e33 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 30 Sep 2016 00:24:23 +0200
Subject: [PATCH 25/48] Fixed typo in Gradle script

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 936d7a88e..6f6171c0c 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -64,7 +64,7 @@ android {
 
 //return a BuildConfigField from a properties file.
 def getBuildConfigField(String property){
-    String value
+    def value
 
     if(travisBuild) {
         value = System.getenv(property)

From 2e33e16365dc4455356794041aa40f160e1f1826 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 30 Sep 2016 16:46:00 +0200
Subject: [PATCH 26/48] Added Telegram channel to Preferences screen

---
 .../swad/swadroid/preferences/Preferences.java |  4 ++++
 .../preferences/PreferencesActivity.java       | 18 ++++++++++++++++++
 SWADroid/src/main/res/values-es/strings.xml    |  4 ----
 SWADroid/src/main/res/values/strings.xml       | 10 ++++++----
 SWADroid/src/main/res/xml/preferences.xml      |  5 +++++
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/Preferences.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/Preferences.java
index 461b2ef14..fe8807d03 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/Preferences.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/Preferences.java
@@ -98,6 +98,10 @@ public class Preferences {
      * Google Plus preference name
      */
     public static final String GOOGLEPLUSPREF = "googlePlusPref";
+    /**
+     * Telegram preference name
+     */
+    public static final String TELEGRAMPREF = "telegramPref";
     /**
      * Blog preference name
      */
diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java
index d229e7266..425075024 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java
@@ -90,6 +90,10 @@ public class PreferencesActivity extends PreferenceActivity implements OnPrefere
      * Google Plus preference
      */
     private static Preference googlePlusPref;
+    /**
+     * Telegram preference
+     */
+    private static Preference telegramPref;
     /**
      * Blog preference
      */
@@ -188,6 +192,7 @@ protected void onCreate(Bundle savedInstanceState) {
         twitterPref = findPreference(Preferences.TWITTERPREF);
         facebookPref = findPreference(Preferences.FACEBOOKPREF);
         googlePlusPref = findPreference(Preferences.GOOGLEPLUSPREF);
+        telegramPref = findPreference(Preferences.TELEGRAMPREF);
         blogPref = findPreference(Preferences.BLOGPREF);
         sharePref = findPreference(Preferences.SHAREPREF);
         syncTimePref = findPreference(Preferences.SYNCTIMEPREF);
@@ -200,6 +205,7 @@ protected void onCreate(Bundle savedInstanceState) {
         twitterPref.setOnPreferenceChangeListener(this);
         facebookPref.setOnPreferenceChangeListener(this);
         googlePlusPref.setOnPreferenceChangeListener(this);
+        telegramPref.setOnPreferenceChangeListener(this);
         blogPref.setOnPreferenceChangeListener(this);
         sharePref.setOnPreferenceChangeListener(this);
         syncEnablePref.setOnPreferenceChangeListener(this);
@@ -272,6 +278,18 @@ public boolean onPreferenceClick(Preference preference) {
                 return true;
             }
         });
+        telegramPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            /**
+             * Called when a preference is selected.
+             * @param preference Preference selected.
+             */
+            public boolean onPreferenceClick(Preference preference) {
+                Intent urlIntent = new Intent(Intent.ACTION_VIEW);
+                urlIntent.setData(Uri.parse(getString(R.string.telegramURL)));
+                startActivity(urlIntent);
+                return true;
+            }
+        });
         blogPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             /**
              * Called when a preference is selected.
diff --git a/SWADroid/src/main/res/values-es/strings.xml b/SWADroid/src/main/res/values-es/strings.xml
index 3896247b3..4423207f2 100644
--- a/SWADroid/src/main/res/values-es/strings.xml
+++ b/SWADroid/src/main/res/values-es/strings.xml
@@ -122,11 +122,7 @@
     <string name="shareBodyMsg">Estoy usando #SWADroid en mi Android para acceder a la
         plataforma de teleformación SWAD.\nObtenlo gratis aquí:
         https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid</string>
-    <string name="twitterTitle">Twitter</string>
-    <string name="facebookTitle">Facebook</string>
-    <string name="googlePlusTitle">Google+</string>
     <string name="blogTitle">Blog</string>
-    <string name="marketTitle">Google Play</string>
     <string name="prefCatSyncTitle">Sincronización</string>
     <string name="prefSyncTimeTitle">Frecuencia de sincronización</string>
     <string name="prefSyncTimeSummary">Frecuencia de sincronización de las notificaciones</string>
diff --git a/SWADroid/src/main/res/values/strings.xml b/SWADroid/src/main/res/values/strings.xml
index 458dcae92..d4873e509 100644
--- a/SWADroid/src/main/res/values/strings.xml
+++ b/SWADroid/src/main/res/values/strings.xml
@@ -125,13 +125,15 @@
     <string name="twitterURL" translatable="false">https://twitter.com/#!/SWADroid</string>
     <string name="facebookURL" translatable="false">https://www.facebook.com/SWADroid</string>
     <string name="googlePlusURL" translatable="false">http://goo.gl/kuezQ</string>
+    <string name="telegramURL" translatable="false">https://telegram.me/swadroid</string>
     <string name="blogURL" translatable="false">http://swadroid.wordpress.com</string>
     <string name="twitterUser" translatable="false">\@SWADroid</string>
-    <string name="twitterTitle">Twitter</string>
-    <string name="facebookTitle">Facebook</string>
-    <string name="googlePlusTitle">Google+</string>
+    <string name="twitterTitle" translatable="false">Twitter</string>
+    <string name="facebookTitle" translatable="false">Facebook</string>
+    <string name="googlePlusTitle" translatable="false">Google+</string>
+    <string name="telegramTitle" translatable="false">Telegram</string>
+    <string name="marketTitle" translatable="false">Google Play</string>
     <string name="blogTitle">Blog</string>
-    <string name="marketTitle">Google Play</string>
     <string name="prefCatSyncTitle">Synchronization</string>
     <string name="prefSyncTimeTitle">Synchronization frecuency</string>
     <string name="prefSyncTimeSummary">Synchronization frecuency of notifications</string>
diff --git a/SWADroid/src/main/res/xml/preferences.xml b/SWADroid/src/main/res/xml/preferences.xml
index 52a499541..a722fb87d 100644
--- a/SWADroid/src/main/res/xml/preferences.xml
+++ b/SWADroid/src/main/res/xml/preferences.xml
@@ -86,6 +86,11 @@
             android:key="googlePlusPref"
             android:summary="@string/googlePlusURL"
             android:title="@string/googlePlusTitle" />
+        <Preference
+            android:defaultValue=""
+            android:key="telegramPref"
+            android:summary="@string/telegramURL"
+            android:title="@string/telegramTitle" />
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file

From 799a30172c7d6cbb8ff731c7853b7d9c9274cd3d Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 30 Sep 2016 17:08:58 +0200
Subject: [PATCH 27/48] Added double quotes in reading of environment variables
 in Travis CI settings

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 6f6171c0c..9391850de 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -67,7 +67,7 @@ def getBuildConfigField(String property){
     def value
 
     if(travisBuild) {
-        value = System.getenv(property)
+        value = "\"" + System.getenv(property) + "\""
     } else {
         Properties properties = new Properties()
         properties.load(new FileInputStream("keystore.properties"))

From b44c346193b0abe2e691e1c7e531994ce2831f60 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 30 Sep 2016 17:32:05 +0200
Subject: [PATCH 28/48] Increased the maximum heap size for the Gradle daemon

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7f722e5f4..684634415 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx2560M
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

From 6293dd2ebe2f0cd16ca214aace11be25e0fd0dce Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 30 Sep 2016 17:34:08 +0200
Subject: [PATCH 29/48] Tell build script to proceed with lint errors

---
 SWADroid/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 9391850de..780cf6556 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -17,6 +17,10 @@ android {
         javaMaxHeapSize "2g"
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
     defaultConfig {
         applicationId "es.ugr.swad.swadroid"
         versionCode gitVersionCode

From ac5da65e8a71f3f8ceffa83796db6f6ef0d7f280 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 30 Sep 2016 17:35:52 +0200
Subject: [PATCH 30/48] Increased the maximum heap size for the Gradle daemon

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 780cf6556..8d9af7549 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -14,7 +14,7 @@ android {
 
     dexOptions {
         maxProcessCount=2
-        javaMaxHeapSize "2g"
+        javaMaxHeapSize "2560M"
     }
 
     lintOptions {

From 3e4b2e2ce24340353339a0cefb6472a756cae103 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 30 Sep 2016 17:49:50 +0200
Subject: [PATCH 31/48] Modified the maximum heap size for the Gradle daemon

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 8d9af7549..780cf6556 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -14,7 +14,7 @@ android {
 
     dexOptions {
         maxProcessCount=2
-        javaMaxHeapSize "2560M"
+        javaMaxHeapSize "2g"
     }
 
     lintOptions {

From 8c35204fbafe930aba118c2c39b2c50195c37d2b Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 30 Sep 2016 20:05:47 +0200
Subject: [PATCH 32/48] Updated Build Tools version

---
 .travis.yml           | 2 +-
 SWADroid/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a2b92a97..cd391e03f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ android:
   - tools
   - tools
   - platform-tools
-  - build-tools-24.0.2
+  - build-tools-24.0.3
   - android-24
   - extra-android-m2repository
   - extra-android-support
diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 780cf6556..308f44c92 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -10,7 +10,7 @@ ext {
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    buildToolsVersion "24.0.3"
 
     dexOptions {
         maxProcessCount=2

From 3d2be659a5d10e634490dc5ebde27b43e2255e56 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 30 Sep 2016 20:11:44 +0200
Subject: [PATCH 33/48] Updated README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 141f78057..815cba3b9 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ CI Status
 
 |Branch|CI status|
 |------|---------|
-|develop|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg?branch=develop)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=develop)|
-|master|[![SWADroid](https://api.travis-ci.org/Amab/SWADroid.svg?branch=master)](https://api.travis-ci.org/Amab/SWADroid.svg?branch=master)|
+|develop|[![Build Status](https://travis-ci.org/Amab/SWADroid.svg?branch=develop)](https://travis-ci.org/Amab/SWADroid)|
+|master|[![Build Status](https://travis-ci.org/Amab/SWADroid.svg?branch=master)](https://travis-ci.org/Amab/SWADroid)|
 
 Copyright and License
 ---------------------

From d54513373ea9306b46c85990d5b853b294139972 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Sun, 9 Oct 2016 10:03:13 +0200
Subject: [PATCH 34/48] Updated ksoap2-android library

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 308f44c92..31d7c9d11 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -85,7 +85,7 @@ dependencies {
     compile 'com.android.support:support-v4:24.2.1'
     compile 'com.android.support:appcompat-v7:24.2.1'
     compile 'com.google.android.gms:play-services-analytics:9.6.1'
-    compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.1'
+    compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
     compile 'commons-io:commons-io:2.5'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compile 'com.journeyapps:zxing-android-embedded:3.2.0@aar'

From 6d79cd45c06de7816f4854b6173a390243d35fab Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Tue, 11 Oct 2016 19:06:55 +0200
Subject: [PATCH 35/48] Updated Gradle plugin

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 07a513831..67db4e130 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.1'
         classpath 'org.ajoberstar:grgit:1.7.0'
     }
 }

From 272b404ef8f806b84630546605df037f2fad5189 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Fri, 14 Oct 2016 22:24:05 +0200
Subject: [PATCH 36/48] Updated README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 815cba3b9..d93e1b578 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Copyright (C) 2010, Juan Miguel Boyero Corral
 
 [![Copyright and License](https://img.shields.io/badge/license-GPLv3-green.svg?style=flat)](http://www.gnu.org/licenses/gpl.html) SWADroid client is free software; you can redistribute it and/or modify it under the same terms as [GPLv3](http://www.gnu.org/licenses/gpl.html) license.
 
-[![Copyright and License](https://img.shields.io/badge/license-LGPLv3-green.svg?style=flat)](http://www.gnu.org/licenses/lgpl.html) SWADroid uses [Android DataFrameWork](http://code.google.com/p/androiddataframework/) library developed by [Javier Pérez Pacheco](http://www.javielinux.com/quiensoy.php) and licensed under [LGPLv3](http://www.gnu.org/licenses/lgpl.html).
+[![Copyright and License](https://img.shields.io/badge/license-LGPLv3-green.svg?style=flat)](http://www.gnu.org/licenses/lgpl.html) SWADroid uses [Android DataFrameWork](http://code.google.com/p/androiddataframework/) library developed by Javier Pérez Pacheco and licensed under [LGPLv3](http://www.gnu.org/licenses/lgpl.html).
 
 [![Copyright and License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](http://www.opensource.org/licenses/mit-license.php) SWADroid uses [ksoap2-android](https://github.com/simpligility/ksoap2-android) library developed by [Manfred Moser](https://github.com/mosabua) and licensed under [MIT](http://www.opensource.org/licenses/mit-license.php).
 
@@ -57,4 +57,4 @@ Contributing
 
 SWADroid is an open source project. I encourage contributions.
 
-The Github team has also been kind enough to write up some great [documentation](http://help.github.com/pull-requests/) on working with pull requests. Contributions should be performed on [topic branches](http://progit.org/book/ch3-4.html) in your personal forks - just issue your pull requests from there.
+The Github team has also been kind enough to write up some great [documentation](https://help.github.com/articles/about-pull-requests/) on working with pull requests. Contributions should be performed on [topic branches](http://progit.org/book/ch3-4.html) in your personal forks - just issue your pull requests from there.

From 43a792fa6c29a41ed86537b28acb52cd02906352 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 20 Oct 2016 20:11:00 +0200
Subject: [PATCH 37/48] Updated Android SDK to API 25

---
 .travis.yml           |  4 ++--
 SWADroid/build.gradle | 10 +++++-----
 build.gradle          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd391e03f..cc8e13680 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ android:
   - tools
   - tools
   - platform-tools
-  - build-tools-24.0.3
-  - android-24
+  - build-tools-25.0.0
+  - android-25
   - extra-android-m2repository
   - extra-android-support
   - extra-google-m2repository
diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 31d7c9d11..4437bebc4 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -9,8 +9,8 @@ ext {
 }
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
 
     dexOptions {
         maxProcessCount=2
@@ -27,7 +27,7 @@ android {
         versionName gitVersionName
 
         minSdkVersion 9
-        targetSdkVersion 24
+        targetSdkVersion 25
 
         android.applicationVariants.all { variant ->
             def appName
@@ -82,8 +82,8 @@ def getBuildConfigField(String property){
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:24.2.1'
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:support-v4:25.0.0'
+    compile 'com.android.support:appcompat-v7:25.0.0'
     compile 'com.google.android.gms:play-services-analytics:9.6.1'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
     compile 'commons-io:commons-io:2.5'
diff --git a/build.gradle b/build.gradle
index 67db4e130..947cad18e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'org.ajoberstar:grgit:1.7.0'
     }
 }

From 1f1162c164aaa5a45a3113d1248d0bedb16ceeec Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Sat, 22 Oct 2016 11:23:32 +0200
Subject: [PATCH 38/48] Updated Google Play Services library

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 4437bebc4..8714481f1 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -84,7 +84,7 @@ def getBuildConfigField(String property){
 dependencies {
     compile 'com.android.support:support-v4:25.0.0'
     compile 'com.android.support:appcompat-v7:25.0.0'
-    compile 'com.google.android.gms:play-services-analytics:9.6.1'
+    compile 'com.google.android.gms:play-services-analytics:9.8.00'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
     compile 'commons-io:commons-io:2.5'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'

From 26a00b5140d15d26a8fcd7ce6e0e9f8e57b2a40e Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Tue, 25 Oct 2016 18:57:00 +0200
Subject: [PATCH 39/48] Updated Google Play Services library

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 8714481f1..1dcd344bd 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -84,7 +84,7 @@ def getBuildConfigField(String property){
 dependencies {
     compile 'com.android.support:support-v4:25.0.0'
     compile 'com.android.support:appcompat-v7:25.0.0'
-    compile 'com.google.android.gms:play-services-analytics:9.8.00'
+    compile 'com.google.android.gms:play-services-analytics:9.8.0'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
     compile 'commons-io:commons-io:2.5'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'

From ace6180301e3aaf3996dc7cfb3f6daf754af1e62 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Tue, 15 Nov 2016 19:39:47 +0100
Subject: [PATCH 40/48] Updated Android Support library

---
 SWADroid/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 1dcd344bd..5cea2c9e7 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -82,8 +82,8 @@ def getBuildConfigField(String property){
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:25.0.0'
-    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.support:support-v4:25.0.1'
+    compile 'com.android.support:appcompat-v7:25.0.1'
     compile 'com.google.android.gms:play-services-analytics:9.8.0'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
     compile 'commons-io:commons-io:2.5'

From 48b2976fbb02144b8483ba93809a773dcbe95a8f Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Mon, 21 Nov 2016 23:44:04 +0100
Subject: [PATCH 41/48] Updated Analytics library

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 5cea2c9e7..e20de1d64 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -84,7 +84,7 @@ def getBuildConfigField(String property){
 dependencies {
     compile 'com.android.support:support-v4:25.0.1'
     compile 'com.android.support:appcompat-v7:25.0.1'
-    compile 'com.google.android.gms:play-services-analytics:9.8.0'
+    compile 'com.google.android.gms:play-services-analytics:10.0.0'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
     compile 'commons-io:commons-io:2.5'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'

From 903a6dee427db428067864aa9f08e74b962ce82f Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Tue, 22 Nov 2016 21:01:08 +0100
Subject: [PATCH 42/48] Updated Android SDK

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index e20de1d64..43bdb3d79 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -10,7 +10,7 @@ ext {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion "25.0.1"
 
     dexOptions {
         maxProcessCount=2

From 6f370dbbe1cfbf89bd1493360d1dc1fb0c2c8845 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Tue, 22 Nov 2016 21:12:49 +0100
Subject: [PATCH 43/48] Updated Build Tools in Travis CI

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cc8e13680..067db74d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ android:
   - tools
   - tools
   - platform-tools
-  - build-tools-25.0.0
+  - build-tools-25.0.1
   - android-25
   - extra-android-m2repository
   - extra-android-support

From 1279d3fbb0252fb1149b9e6327b4449fb2e8238e Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Wed, 30 Nov 2016 20:10:48 +0100
Subject: [PATCH 44/48] Updated Analytics library

---
 SWADroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 43bdb3d79..0891d2b9e 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -84,7 +84,7 @@ def getBuildConfigField(String property){
 dependencies {
     compile 'com.android.support:support-v4:25.0.1'
     compile 'com.android.support:appcompat-v7:25.0.1'
-    compile 'com.google.android.gms:play-services-analytics:10.0.0'
+    compile 'com.google.android.gms:play-services-analytics:10.0.1'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
     compile 'commons-io:commons-io:2.5'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'

From 86c95583844055974ef71f9d77fb207359e6a8c7 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Wed, 7 Dec 2016 19:57:03 +0100
Subject: [PATCH 45/48] Updated Gradle plugin

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 947cad18e..f4aea3ac8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'org.ajoberstar:grgit:1.7.0'
     }
 }

From fe2be20ed9fcc8058f5b1a07f7ea0c52cef86bb7 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Wed, 14 Dec 2016 22:38:42 +0100
Subject: [PATCH 46/48] Updated SDK version

---
 .travis.yml           | 2 +-
 SWADroid/build.gradle | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 067db74d7..a6616243e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ android:
   - tools
   - tools
   - platform-tools
-  - build-tools-25.0.1
+  - build-tools-25.0.2
   - android-25
   - extra-android-m2repository
   - extra-android-support
diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index 0891d2b9e..9e09ce293 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -10,7 +10,7 @@ ext {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.2"
 
     dexOptions {
         maxProcessCount=2
@@ -82,8 +82,8 @@ def getBuildConfigField(String property){
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:25.0.1'
-    compile 'com.android.support:appcompat-v7:25.0.1'
+    compile 'com.android.support:support-v4:25.1.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
     compile 'com.google.android.gms:play-services-analytics:10.0.1'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
     compile 'commons-io:commons-io:2.5'

From 5ac786cc90e3e281ac34300766be062863c44ab8 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Sat, 21 Jan 2017 18:14:55 +0100
Subject: [PATCH 47/48] Fixes #232

---
 SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java   | 6 ++++--
 SWADroid/src/main/java/es/ugr/swad/swadroid/model/User.java | 4 +++-
 .../swad/swadroid/modules/notifications/Notifications.java  | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java
index 579f9b929..c398f72f9 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java
@@ -235,7 +235,7 @@ protected void onResume() {
             }
 
             //If today is the user birthday, show birthday message
-            if((Login.getLoggedUser() != null)
+            if((Login.getLoggedUser() != null) && (Login.getLoggedUser().getUserBirthday() != null)
                     && DateTimeUtils.isBirthday(Login.getLoggedUser().getUserBirthday())) {
 
                 showBirthdayMessage();
@@ -292,7 +292,9 @@ private void upgradeApp(int lastVersion, int currentVersion) throws NoSuchAlgori
             Preferences.upgradeCredentials();
 
             Preferences.setSyncTime(String.valueOf(Constants.DEFAULT_SYNC_TIME));
-        } else if(lastVersion < 57) {
+        }
+
+        if(lastVersion < 57) {
             //Reconfigure automatic synchronization
             SyncUtils.removePeriodicSync(Constants.AUTHORITY, Bundle.EMPTY, this);
             if(!Preferences.getSyncTime().equals("0") && Preferences.isSyncEnabled()) {
diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/model/User.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/User.java
index 552b6dc8e..74df822be 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/model/User.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/User.java
@@ -28,6 +28,8 @@
 import java.util.Hashtable;
 import java.util.Locale;
 
+import es.ugr.swad.swadroid.Constants;
+
 /**
  * User data.
  *
@@ -256,7 +258,7 @@ public Calendar getUserBirthday() {
      * @param userBirthday User birthday.
      */
     private void setUserBirthday(String userBirthday) throws ParseException {
-        if((userBirthday != null) && !userBirthday.equals("00000000")) {
+        if((userBirthday != null) && !userBirthday.equals(Constants.NULL_VALUE) && !userBirthday.equals("00000000")) {
             this.userBirthday = Calendar.getInstance();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd", Locale.getDefault());
 
diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java
index 8d7f7e5e6..8b54646ae 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java
@@ -196,7 +196,7 @@ private void refreshScreen() {
 		hideSwipeProgress();
 
         //If today is the user birthday, show birthday message
-        if((Login.getLoggedUser() != null)
+        if((Login.getLoggedUser() != null) && (Login.getLoggedUser().getUserBirthday() != null)
                 && DateTimeUtils.isBirthday(Login.getLoggedUser().getUserBirthday())) {
             mBirthdayTextView.setText(getString(R.string.birthdayMsg).replace(
                     Constants.USERNAME_TEMPLATE, Login.getLoggedUser().getUserFirstname()));
@@ -475,7 +475,7 @@ protected void requestService() throws Exception {
 	 */
 	@Override
 	protected void connect() {
-		Toast.makeText(this, R.string.notificationsProgressDescription, Toast.LENGTH_SHORT).show();
+		//Toast.makeText(this, R.string.notificationsProgressDescription, Toast.LENGTH_SHORT).show();
 
 		startConnection();
 	}

From 9433c64ed5f362e88630ed8755a57f71f1168852 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Sat, 21 Jan 2017 18:26:01 +0100
Subject: [PATCH 48/48] Updated changelog

---
 SWADroid/src/main/res/raw-es/changes.html | 5 +++++
 SWADroid/src/main/res/raw/changes.html    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/SWADroid/src/main/res/raw-es/changes.html b/SWADroid/src/main/res/raw-es/changes.html
index 815034c10..f5328d4de 100644
--- a/SWADroid/src/main/res/raw-es/changes.html
+++ b/SWADroid/src/main/res/raw-es/changes.html
@@ -15,6 +15,11 @@
 </head>
 
 <body bgcolor="white">
+<h4>1.5.1 (2017-01-21)</h4>
+<ul>
+    <lh class="fix">[CORRECCIONES]</lh>
+    <li type="disc">Corregido error unparseable date: &quot;anyType{}&quot;(at offset 0)</li>
+</ul>
 <h4>1.5.0 (2016-09-01)</h4>
 <ul>
     <lh class="new">[NOVEDADES]</lh>
diff --git a/SWADroid/src/main/res/raw/changes.html b/SWADroid/src/main/res/raw/changes.html
index 588378b4a..37fe6b3c6 100644
--- a/SWADroid/src/main/res/raw/changes.html
+++ b/SWADroid/src/main/res/raw/changes.html
@@ -15,6 +15,11 @@
 </head>
 
 <body bgcolor="white">
+<h4>1.5.1 (2017-01-21)</h4>
+<ul>
+    <lh class="fix">[FIXES]</lh>
+    <li type="disc">Fixed unparseable date: &quot;anyType{}&quot;(at offset 0) error</li>
+</ul>
 <h4>1.5.0 (2016-09-01)</h4>
 <ul>
     <lh class="new">[NEW]</lh>