Bessere Sortierung der Chatnachrichten
This commit is contained in:
@@ -303,7 +303,16 @@ public class DatabaseHandler extends SQLiteOpenHelper {
|
||||
|
||||
Cursor cursor = readableDatabase.query(
|
||||
TABLE_CHATMESSAGE,
|
||||
new String[] {KEY_ID_CHATMESSAGE, KEY_SENDER_PERSON_OID_CHATMESSAGE, KEY_RECIPIENT_PERSON_OID_CHATMESSAGE, KEY_INSTS_CHATMESSAGE, KEY_CHAT_TEXT_CHATMESSAGE, KEY_IS_DELIVERED_CHATMESSAGE, KEY_SERVERSEITIGE_OID_CHATMESSAGE, KEY_IS_TEAM_CHATMESSAGE},
|
||||
new String[] {
|
||||
KEY_ID_CHATMESSAGE,
|
||||
KEY_SENDER_PERSON_OID_CHATMESSAGE,
|
||||
KEY_RECIPIENT_PERSON_OID_CHATMESSAGE,
|
||||
KEY_INSTS_CHATMESSAGE,
|
||||
KEY_CHAT_TEXT_CHATMESSAGE,
|
||||
KEY_IS_DELIVERED_CHATMESSAGE,
|
||||
KEY_SERVERSEITIGE_OID_CHATMESSAGE,
|
||||
KEY_IS_TEAM_CHATMESSAGE
|
||||
},
|
||||
KEY_ID_CHATMESSAGE + "=?",
|
||||
new String[]{String.valueOf(id)},
|
||||
null, null, null, null);
|
||||
@@ -334,8 +343,22 @@ public class DatabaseHandler extends SQLiteOpenHelper {
|
||||
|
||||
Cursor cursor = readableDatabase.query(
|
||||
TABLE_CHATMESSAGE,
|
||||
new String[] {KEY_ID_CHATMESSAGE, KEY_SENDER_PERSON_OID_CHATMESSAGE, KEY_RECIPIENT_PERSON_OID_CHATMESSAGE, KEY_INSTS_CHATMESSAGE, KEY_CHAT_TEXT_CHATMESSAGE, KEY_IS_DELIVERED_CHATMESSAGE, KEY_SERVERSEITIGE_OID_CHATMESSAGE, KEY_IS_TEAM_CHATMESSAGE},
|
||||
KEY_SENDER_PERSON_OID_CHATMESSAGE + "=? AND " + KEY_RECIPIENT_PERSON_OID_CHATMESSAGE + "=? OR " + KEY_RECIPIENT_PERSON_OID_CHATMESSAGE + "=? AND " + KEY_SENDER_PERSON_OID_CHATMESSAGE + "=?",
|
||||
new String[] {
|
||||
KEY_ID_CHATMESSAGE,
|
||||
KEY_SENDER_PERSON_OID_CHATMESSAGE,
|
||||
KEY_RECIPIENT_PERSON_OID_CHATMESSAGE,
|
||||
KEY_INSTS_CHATMESSAGE,
|
||||
KEY_CHAT_TEXT_CHATMESSAGE,
|
||||
KEY_IS_DELIVERED_CHATMESSAGE,
|
||||
KEY_SERVERSEITIGE_OID_CHATMESSAGE,
|
||||
KEY_IS_TEAM_CHATMESSAGE
|
||||
},
|
||||
KEY_IS_TEAM_CHATMESSAGE + " = 0 AND " +
|
||||
KEY_SENDER_PERSON_OID_CHATMESSAGE + "=? AND " +
|
||||
KEY_RECIPIENT_PERSON_OID_CHATMESSAGE + "=? OR " +
|
||||
KEY_RECIPIENT_PERSON_OID_CHATMESSAGE + "=? AND " +
|
||||
KEY_SENDER_PERSON_OID_CHATMESSAGE + "=?"
|
||||
,
|
||||
new String[] {String.valueOf(SoapConnectionManager.User.getPersonOid()), String.valueOf(recipientOid), String.valueOf(SoapConnectionManager.User.getPersonOid()), String.valueOf(recipientOid)},
|
||||
null, null, null, null);
|
||||
|
||||
@@ -587,6 +610,28 @@ public class DatabaseHandler extends SQLiteOpenHelper {
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean GetIsMessageInDatabase(int pServerseitigeOid) {
|
||||
|
||||
SQLiteDatabase readableDatabase = this.getReadableDatabase();
|
||||
|
||||
Cursor cursor = readableDatabase.query(TABLE_CHATMESSAGE,
|
||||
new String[] {
|
||||
KEY_ID_CHATMESSAGE,
|
||||
KEY_SENDER_PERSON_OID_CHATMESSAGE,
|
||||
KEY_RECIPIENT_PERSON_OID_CHATMESSAGE,
|
||||
KEY_INSTS_CHATMESSAGE,
|
||||
KEY_CHAT_TEXT_CHATMESSAGE,
|
||||
KEY_IS_DELIVERED_CHATMESSAGE,
|
||||
KEY_SERVERSEITIGE_OID_CHATMESSAGE,
|
||||
KEY_IS_TEAM_CHATMESSAGE
|
||||
},
|
||||
KEY_SERVERSEITIGE_OID_CHATMESSAGE + " =?",
|
||||
new String[] {String.valueOf(pServerseitigeOid)},
|
||||
null, null, null, null);
|
||||
|
||||
return cursor != null && cursor.moveToFirst();
|
||||
}
|
||||
|
||||
public ArrayList<ChatMessage> getUnsentChatMessages() {
|
||||
ArrayList<ChatMessage> messages = new ArrayList<>();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user