Skip to content

Commit deb6b42

Browse files
committed
FinishedMIssionStore: Throw exception if column is missing
../../src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java:105: Value must be ≥ 0 but getColumnIndex can be -1 Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
1 parent 2f3a993 commit deb6b42

1 file changed

Lines changed: 17 additions & 7 deletions

File tree

app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,23 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
102102
db.beginTransaction();
103103
while (cursor.moveToNext()) {
104104
ContentValues values = new ContentValues();
105-
values.put(KEY_SOURCE, cursor.getString(cursor.getColumnIndex(KEY_SOURCE)));
106-
values.put(KEY_DONE, cursor.getString(cursor.getColumnIndex(KEY_DONE)));
107-
values.put(KEY_TIMESTAMP, cursor.getLong(cursor.getColumnIndex(KEY_TIMESTAMP)));
108-
values.put(KEY_KIND, cursor.getString(cursor.getColumnIndex(KEY_KIND)));
105+
values.put(
106+
KEY_SOURCE,
107+
cursor.getString(cursor.getColumnIndexOrThrow(KEY_SOURCE))
108+
);
109+
values.put(
110+
KEY_DONE,
111+
cursor.getString(cursor.getColumnIndexOrThrow(KEY_DONE))
112+
);
113+
values.put(
114+
KEY_TIMESTAMP,
115+
cursor.getLong(cursor.getColumnIndexOrThrow(KEY_TIMESTAMP))
116+
);
117+
values.put(KEY_KIND, cursor.getString(cursor.getColumnIndexOrThrow(KEY_KIND)));
109118
values.put(KEY_PATH, Uri.fromFile(
110119
new File(
111-
cursor.getString(cursor.getColumnIndex(KEY_LOCATION)),
112-
cursor.getString(cursor.getColumnIndex(KEY_NAME))
120+
cursor.getString(cursor.getColumnIndexOrThrow(KEY_LOCATION)),
121+
cursor.getString(cursor.getColumnIndexOrThrow(KEY_NAME))
113122
)
114123
).toString());
115124

@@ -141,7 +150,8 @@ private ContentValues getValuesOfMission(@NonNull Mission downloadMission) {
141150
}
142151

143152
private FinishedMission getMissionFromCursor(Cursor cursor) {
144-
String kind = Objects.requireNonNull(cursor).getString(cursor.getColumnIndex(KEY_KIND));
153+
String kind = Objects.requireNonNull(cursor)
154+
.getString(cursor.getColumnIndexOrThrow(KEY_KIND));
145155
if (kind == null || kind.isEmpty()) kind = "?";
146156

147157
String path = cursor.getString(cursor.getColumnIndexOrThrow(KEY_PATH));

0 commit comments

Comments
 (0)