TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-26 09:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor group logic (no visual changes)

Browse Source 
Closes #4480
// FREEBIE
This commit is contained in:
Jake McGinty
2015-11-05 10:41:43 -08:00
committed by Moxie Marlinspike
parent 75483299dc
commit d05097a6fd
6 changed files with 508 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/database/GroupDatabase.java
View File

@@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.database;
import android.annotation.SuppressLint;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
@@ -8,6 +9,8 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.graphics.Bitmap;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Log;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -67,7 +70,8 @@ public class GroupDatabase extends Database {
super(context, databaseHelper);
}
public GroupRecord getGroup(byte[] groupId) {
public @Nullable GroupRecord getGroup(byte[] groupId) {
@SuppressLint("Recycle")
Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, GROUP_ID + " = ?",
new String[] {GroupUtil.getEncodedId(groupId)},
null, null, null);
@@ -92,7 +96,7 @@ public class GroupDatabase extends Database {
return new Reader(cursor);
}
public Recipients getGroupMembers(byte[] groupId, boolean includeSelf) {
public @NonNull Recipients getGroupMembers(byte[] groupId, boolean includeSelf) {
String localNumber = TextSecurePreferences.getLocalNumber(context);
List<String> members = getCurrentMembers(groupId);
List<Recipient> recipients = new LinkedList<>();
@@ -248,7 +252,7 @@ public class GroupDatabase extends Database {
this.cursor = cursor;
}
public GroupRecord getNext() {
public @Nullable GroupRecord getNext() {
if (cursor == null || !cursor.moveToNext()) {
return null;
}