Fixed notifications bug in surname
This commit is contained in:
parent
232cce066e
commit
644b1cc6ef
|
@ -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">
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user