Fixes #232

Amab · Jan 21, 2017 · 5ac786c · 5ac786c
1 parent fe2be20
commit 5ac786c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 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
@@ -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
@@ -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
@@ -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();
 	}