moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-24 07:58:50 -05:00
Code Issues Releases Wiki Activity

the select public key list now uses the selection for the ordering, putting already selected keys on top, also correctly maintains the selection over repeated filtering

Browse Source
This commit is contained in:
Thialfihar 2010-06-06 15:54:27 +00:00
parent a0ab240214
commit 68d74b4d54
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thialfihar/android/apg/SelectPublicKeyListActivity.java
View File

@ -92,9 +92,7 @@ public class SelectPublicKeyListActivity extends BaseActivity {
} }
long selectedKeyIds[] = null; long selectedKeyIds[] = null;
if (getIntent().getExtras() != null) { selectedKeyIds = intent.getLongArrayExtra(Apg.EXTRA_SELECTION);
selectedKeyIds = getIntent().getExtras().getLongArray(Apg.EXTRA_SELECTION);
}
if (selectedKeyIds == null) { if (selectedKeyIds == null) {
Vector<Long> vector = new Vector<Long>(); Vector<Long> vector = new Vector<Long>();

35
src/org/thialfihar/android/apg/SelectPublicKeyListAdapter.java
View File

@ -25,6 +25,7 @@ import org.thialfihar.android.apg.provider.UserIds;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.DatabaseUtils;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder; import android.database.sqlite.SQLiteQueryBuilder;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -63,6 +64,19 @@ public class SelectPublicKeyListAdapter extends BaseAdapter {
UserIds.TABLE_NAME + "." + UserIds.KEY_ID + " AND " + UserIds.TABLE_NAME + "." + UserIds.KEY_ID + " AND " +
UserIds.TABLE_NAME + "." + UserIds.RANK + " = '0') "); UserIds.TABLE_NAME + "." + UserIds.RANK + " = '0') ");
String inIdList = null;
if (selectedKeyIds != null && selectedKeyIds.length > 0) {
inIdList = KeyRings.TABLE_NAME + "." + KeyRings.MASTER_KEY_ID + " IN (";
for (int i = 0; i < selectedKeyIds.length; ++i) {
if (i != 0) {
inIdList += ", ";
}
inIdList += DatabaseUtils.sqlEscapeString("" + selectedKeyIds[i]);
}
inIdList += ")";
}
if (searchString != null && searchString.trim().length() > 0) { if (searchString != null && searchString.trim().length() > 0) {
String[] chunks = searchString.trim().split(" +"); String[] chunks = searchString.trim().split(" +");
qb.appendWhere("(EXISTS (SELECT tmp." + UserIds._ID + " FROM " + qb.appendWhere("(EXISTS (SELECT tmp." + UserIds._ID + " FROM " +
@ -75,21 +89,16 @@ public class SelectPublicKeyListAdapter extends BaseAdapter {
} }
qb.appendWhere("))"); qb.appendWhere("))");
if (selectedKeyIds != null && selectedKeyIds.length > 0) { if (inIdList != null) {
qb.appendWhere(" OR "); qb.appendWhere(" OR (" + inIdList + ")");
qb.appendWhere("(" + KeyRings.TABLE_NAME + "." + KeyRings.MASTER_KEY_ID +
" IN (");
for (int i = 0; i < selectedKeyIds.length; ++i) {
if (i != 0) {
qb.appendWhere(", ");
}
qb.appendWhereEscapeString("" + selectedKeyIds[i]);
}
qb.appendWhere("))");
} }
} }
String orderBy = UserIds.TABLE_NAME + "." + UserIds.USER_ID + " ASC";
if (inIdList != null) {
orderBy = inIdList + " DESC, " + orderBy;
}
mCursor = qb.query(mDatabase, mCursor = qb.query(mDatabase,
new String[] { new String[] {
KeyRings.TABLE_NAME + "." + KeyRings._ID, // 0 KeyRings.TABLE_NAME + "." + KeyRings._ID, // 0
@ -111,7 +120,7 @@ public class SelectPublicKeyListAdapter extends BaseAdapter {
}, },
KeyRings.TABLE_NAME + "." + KeyRings.TYPE + " = ?", KeyRings.TABLE_NAME + "." + KeyRings.TYPE + " = ?",
new String[] { "" + Id.database.type_public }, new String[] { "" + Id.database.type_public },
null, null, UserIds.TABLE_NAME + "." + UserIds.USER_ID + " ASC"); null, null, orderBy);
activity.startManagingCursor(mCursor); activity.startManagingCursor(mCursor);
} }