ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Diverse Bugs im Chat-Server und in der Android-App behoben.

Browse Source
This commit is contained in:
staccatomamba
2016-08-17 16:37:40 +02:00
parent 3aff723898
commit a6bc62d7d7
11 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Android/BewoMitarbeiterApp/app/src/main/java/Database/DatabaseHandler.java
View File

@@ -168,9 +168,9 @@ public class DatabaseHandler extends SQLiteOpenHelper {
values.put(KEY_RECIPIENT_PERSON_OID_CHATMESSAGE, message.RecipientPersonOid);
values.put(KEY_INSTS_CHATMESSAGE, getDateTimeString(message.InsTs));
values.put(KEY_CHAT_TEXT_CHATMESSAGE, message.ChatText);
values.put(KEY_IS_DELIVERED_CHATMESSAGE, (message.IsDelivered ? 1 : 0));
values.put(KEY_IS_DELIVERED_CHATMESSAGE, message.IsDelivered ? 1 : 0);
values.put(KEY_SERVERSEITIGE_OID_CHATMESSAGE, message.ServerseitigeOid);
values.put(KEY_IS_TEAM_CHATMESSAGE, message.IsTeam);
values.put(KEY_IS_TEAM_CHATMESSAGE, message.IsTeam ? 1 : 0);
db.insertOrThrow(TABLE_CHATMESSAGE, null, values);
@@ -203,9 +203,9 @@ public class DatabaseHandler extends SQLiteOpenHelper {
values.put(KEY_RECIPIENT_PERSON_OID_CHATMESSAGE, message.RecipientPersonOid);
values.put(KEY_INSTS_CHATMESSAGE, getDateTimeString(message.InsTs));
values.put(KEY_CHAT_TEXT_CHATMESSAGE, message.ChatText);
values.put(KEY_IS_DELIVERED_CHATMESSAGE, (message.IsDelivered ? 1 : 0));
values.put(KEY_IS_DELIVERED_CHATMESSAGE, message.IsDelivered ? 1 : 0);
values.put(KEY_SERVERSEITIGE_OID_CHATMESSAGE, message.ServerseitigeOid);
values.put(KEY_IS_TEAM_CHATMESSAGE, message.IsTeam);
values.put(KEY_IS_TEAM_CHATMESSAGE, message.IsTeam ? 1 : 0);
return values;
}
@@ -218,9 +218,9 @@ public class DatabaseHandler extends SQLiteOpenHelper {
values.put(KEY_RECIPIENT_PERSON_OID_CHATMESSAGE, message.RecipientPersonOid);
values.put(KEY_INSTS_CHATMESSAGE, getDateTimeString(message.InsTs));
values.put(KEY_CHAT_TEXT_CHATMESSAGE, message.ChatText);
values.put(KEY_IS_DELIVERED_CHATMESSAGE, (message.IsDelivered ? 1 : 0));
values.put(KEY_IS_DELIVERED_CHATMESSAGE, message.IsDelivered ? 1 : 0);
values.put(KEY_SERVERSEITIGE_OID_CHATMESSAGE, message.ServerseitigeOid);
values.put(KEY_IS_TEAM_CHATMESSAGE, message.IsTeam);
values.put(KEY_IS_TEAM_CHATMESSAGE, message.IsTeam ? 1 : 0);
int result = db.update(TABLE_CHATMESSAGE, values, KEY_ID_CHATMESSAGE + " = ?", new String[] { String.valueOf(message.Id)});
db.close();
@@ -330,9 +330,9 @@ public class DatabaseHandler extends SQLiteOpenHelper {
int recipientPersonOid = cursor.getInt(2);
Date insTs = getDateFromString(cursor.getString(3));
String chatText = cursor.getString(4);
boolean isDelivered = cursor.getInt(5) != 0;
boolean isDelivered = cursor.getInt(5) == 1;
int serverseitigeOid = cursor.getInt(6);
boolean isTeam = cursor.getInt(7) != 0;
boolean isTeam = cursor.getInt(7) == 1;
cursor.close();
db.close();
@@ -365,9 +365,9 @@ public class DatabaseHandler extends SQLiteOpenHelper {
cursor.getInt(2),
getDateFromString(cursor.getString(3)),
cursor.getString(4),
cursor.getInt(5) != 0,
cursor.getInt(5) == 1,
cursor.getInt(6),
cursor.getInt(7) != 0
cursor.getInt(7) == 1
);
messages.add(message);
@@ -400,9 +400,9 @@ public class DatabaseHandler extends SQLiteOpenHelper {
cursor.getInt(2),
getDateFromString(cursor.getString(3)),
cursor.getString(4),
cursor.getInt(5) != 0,
cursor.getInt(5) == 1,
cursor.getInt(6),
cursor.getInt(7) != 0
cursor.getInt(7) == 1
);
messages.add(message);
@@ -530,9 +530,13 @@ public class DatabaseHandler extends SQLiteOpenHelper {
public byte[] getUserImage(Integer personOid) {
SQLiteDatabase db = this.getReadableDatabase();
Cursor cursor = db.query(TABLE_CONTACTS, new String[] {KEY_PERSONOID}, KEY_PERSONOID + " = " + personOid, null, null, null, null);
Cursor cursor = db.query(TABLE_CONTACTS, new String[] {KEY_PICTURE_BLOB}, KEY_PERSONOID + " = " + personOid, null, null, null, null);
byte[] picture = cursor.getBlob(0);
byte[] picture = null;
if(cursor != null && cursor.moveToFirst()) {
cursor.getBlob(0);
}
cursor.close();
db.close();