wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix reading of LocalFolder.databaseId

Browse source
This commit is contained in:
cketti 2020-06-12 18:34:00 +02:00
parent c31b753d26
commit 99029a07b9
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java
View file

@ -87,7 +87,7 @@ public class LocalFolder {
private FolderType type = FolderType.REGULAR; private FolderType type = FolderType.REGULAR;
private String serverId = null; private String serverId = null;
private String name; private String name;
private long databaseId = -1; private long databaseId = -1L;
private int visibleLimit = -1; private int visibleLimit = -1;
private String prefId = null; private String prefId = null;
@ -172,10 +172,7 @@ public class LocalFolder {
} }
if (cursor.moveToFirst() && !cursor.isNull(LocalStore.FOLDER_ID_INDEX)) { if (cursor.moveToFirst() && !cursor.isNull(LocalStore.FOLDER_ID_INDEX)) {
int folderId = cursor.getInt(LocalStore.FOLDER_ID_INDEX); open(cursor);
if (folderId > 0) {
open(cursor);
}
} else { } else {
throw new MessagingException("LocalFolder.open(): Folder not found: " + throw new MessagingException("LocalFolder.open(): Folder not found: " +
serverId + " (" + databaseId + ")", true); serverId + " (" + databaseId + ")", true);
@ -194,7 +191,7 @@ public class LocalFolder {
} }
void open(Cursor cursor) throws MessagingException { void open(Cursor cursor) throws MessagingException {
databaseId = cursor.getInt(LocalStore.FOLDER_ID_INDEX); databaseId = cursor.getLong(LocalStore.FOLDER_ID_INDEX);
serverId = cursor.getString(LocalStore.FOLDER_SERVER_ID_INDEX); serverId = cursor.getString(LocalStore.FOLDER_SERVER_ID_INDEX);
visibleLimit = cursor.getInt(LocalStore.FOLDER_VISIBLE_LIMIT_INDEX); visibleLimit = cursor.getInt(LocalStore.FOLDER_VISIBLE_LIMIT_INDEX);
status = cursor.getString(LocalStore.FOLDER_STATUS_INDEX); status = cursor.getString(LocalStore.FOLDER_STATUS_INDEX);
@ -221,7 +218,7 @@ public class LocalFolder {
} }
public boolean isOpen() { public boolean isOpen() {
return (databaseId != -1 && serverId != null); return (databaseId != -1L && serverId != null);
} }
public String getServerId() { public String getServerId() {
@ -352,7 +349,7 @@ public class LocalFolder {
} }
public int getUnreadMessageCount() throws MessagingException { public int getUnreadMessageCount() throws MessagingException {
if (databaseId == -1) { if (databaseId == -1L) {
open(); open();
} }