From 644b1cc6ef26f05218f259477e5309957cb7d4d2 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Thu, 14 Apr 2011 20:16:06 +0200
Subject: [PATCH] Fixed notifications bug in surname

---
 SWADroid/AndroidManifest.xml                   |  2 +-
 .../NotificationsCursorAdapter.java            | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/SWADroid/AndroidManifest.xml b/SWADroid/AndroidManifest.xml
index 4e45e062..9da89e44 100644
--- a/SWADroid/AndroidManifest.xml
+++ b/SWADroid/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="es.ugr.swad.swadroid"
       android:installLocation="auto" android:versionCode="12" android:versionName="0.3.6">
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher_swadroid" android:debuggable="false">
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher_swadroid" android:debuggable="true">
          <activity android:name=".SWADMain"
                    android:label="@string/app_name"
                    android:icon="@drawable/ic_launcher_swadroid" android:configChanges="keyboard|keyboardHidden|orientation" android:theme="@android:style/Theme.NoTitleBar">
diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java
index ab224d48..7885109b 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java
@@ -50,7 +50,7 @@ public class NotificationsCursorAdapter extends CursorAdapter {
 	@Override
 	public void bindView(View view, Context context, Cursor cursor) {		
 		long unixTime;
-		String type, sender, summaryText, contentText;
+		String type, sender, senderFirstname, senderSurname1, senderSurname2, summaryText, contentText;
 		String[] dateContent;
     	Date d;
     	
@@ -98,9 +98,19 @@ public class NotificationsCursorAdapter extends CursorAdapter {
         	eventTime.setText(dateContent[1]);
         }
         if(eventSender != null){
-        	sender = cursor.getString(cursor.getColumnIndex("userFirstname")) + " "
-        			+ cursor.getString(cursor.getColumnIndex("userSurname1")) + " "
-        			+ cursor.getString(cursor.getColumnIndex("userSurname2"));
+        	sender = "";
+        	senderFirstname = cursor.getString(cursor.getColumnIndex("userFirstname"));
+        	senderSurname1 = cursor.getString(cursor.getColumnIndex("userSurname1"));
+        	senderSurname2 = cursor.getString(cursor.getColumnIndex("userSurname2"));
+        	
+        	//Empty fields checking
+        	if(!senderFirstname.equals("anyType{}"))
+        		sender += senderFirstname + " ";
+        	if(!senderSurname1.equals("anyType{}"))
+        		sender += senderSurname1 + " ";
+        	if(!senderSurname2.equals("anyType{}"))
+        		sender += senderSurname2;
+        	
         	eventSender.setText(sender);
         }
         if(location != null) {