diff --git a/src/it/reyboz/bustorino/middleware/OldDB.java b/src/it/reyboz/bustorino/middleware/OldDB.java
index 8c52f57..d7a853c 100644
--- a/src/it/reyboz/bustorino/middleware/OldDB.java
+++ b/src/it/reyboz/bustorino/middleware/OldDB.java
@@ -1,61 +1,67 @@
/*
BusTO ("backend" components)
Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.middleware;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import java.io.File;
public class OldDB extends SQLiteOpenHelper {
private static final String DATABASE_NAME_OLD = "bustorino.db";
private int oldVersion = -1;
public OldDB(Context c) {
super(c, DATABASE_NAME_OLD, null, 1337);
}
@Override
public void onCreate(SQLiteDatabase sqLiteDatabase) {
throw new IllegalStateException("Don't create this database!");
}
@Override
public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldV, int newV) {
- // needed to determine what version this database was. Probably 6 or 7.
+ // needed to determine what version this database was. Probably 8.
this.oldVersion = oldV;
}
public int getOldVersion() {
if(this.oldVersion == -1) {
- return getReadableDatabase().getVersion();
+ int newVersion = getReadableDatabase().getVersion();
+ // getReadableDatabase might call onUpgrade
+ if(this.oldVersion != -1) {
+ return this.oldVersion;
+ } else {
+ return newVersion;
+ }
} else {
return this.oldVersion;
}
}
public static boolean doesItExist(Context context) {
- return new File(context.getFilesDir(), DATABASE_NAME_OLD).exists();
+ return context.getDatabasePath(DATABASE_NAME_OLD).exists();
}
public static boolean destroy(Context context) {
- return new File(context.getFilesDir(), DATABASE_NAME_OLD).delete();
+ return context.getDatabasePath(DATABASE_NAME_OLD).delete();
}
}
diff --git a/src/it/reyboz/bustorino/middleware/UserDB.java b/src/it/reyboz/bustorino/middleware/UserDB.java
index 691f0cb..d2a3d7f 100644
--- a/src/it/reyboz/bustorino/middleware/UserDB.java
+++ b/src/it/reyboz/bustorino/middleware/UserDB.java
@@ -1,244 +1,240 @@
/*
BusTO ("backend" components)
Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.middleware;
import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteOpenHelper;
import android.content.Context;
import android.util.Log;
import java.util.ArrayList;
import java.util.List;
import it.reyboz.bustorino.backend.Stop;
import it.reyboz.bustorino.backend.StopsDBInterface;
public class UserDB extends SQLiteOpenHelper {
public static final int DATABASE_VERSION = 1;
private static final String DATABASE_NAME = "user.db";
private final Context c; // needed during upgrade
private static String[] usernameColumnNameAsArray = {"username"};
private static String[] getFavoritesColumnNamesAsArray = {"ID", "username"};
public UserDB(Context context) {
super(context, DATABASE_NAME, null, DATABASE_VERSION);
this.c = context;
}
@Override
public void onCreate(SQLiteDatabase db) {
// exception intentionally left unhandled
db.execSQL("CREATE TABLE favorites (ID TEXT PRIMARY KEY NOT NULL, username TEXT)");
- //if(OldDB.doesItExist(this.c)) {
- upgradeFromOldDatabase();
- //}
+ if(OldDB.doesItExist(this.c)) {
+ upgradeFromOldDatabase();
+ }
}
private void upgradeFromOldDatabase() {
OldDB old;
try {
old = new OldDB(this.c);
} catch(IllegalStateException e) {
// can't create database => it doesn't really exist, no matter what doesItExist() says
return;
}
int ver = old.getOldVersion();
/* version 8 was the previous version, OldDB "upgrades" itself to 1337 but unless the app
* has crashed midway through the upgrade and the user is retrying, that should never show
* up here. And if it does, try to recover favorites anyway.
* Versions < 8 already got dropped during the update process, so let's do the same.
+ *
+ * Update: Android runs getOldVersion() then, after a while, onUpgrade(). Just to make it
+ * more complicated. Workaround in OldDB anyway.
*/
if(ver >= 8) {
ArrayList ID = new ArrayList<>();
- ArrayList name = new ArrayList<>();
ArrayList username = new ArrayList<>();
int len;
int len2;
try {
- Cursor c = old.getReadableDatabase().rawQuery("SELECT busstop_ID, busstop_name, busstop_username FROM busstop WHERE busstop_isfavorite = 1 ORDER BY busstop_name ASC", new String[] {});
+ Cursor c = old.getReadableDatabase().rawQuery("SELECT busstop_ID, busstop_username FROM busstop WHERE busstop_isfavorite = 1 ORDER BY busstop_name ASC", new String[] {});
int zero = c.getColumnIndex("busstop_ID");
- int one = c.getColumnIndex("busstop_name");
- int two = c.getColumnIndex("busstop_username");
+ int one = c.getColumnIndex("busstop_username");
while(c.moveToNext()) {
- ID.add(c.getString(zero));
-
- if(c.getString(one).length() <= 0) {
- name.add(null);
- } else {
- name.add(c.getString(one));
+ try {
+ ID.add(c.getString(zero));
+ } catch(Exception e) {
+ // no ID = can't add this
+ continue;
}
- if(c.getString(two).length() <= 0) {
+ if(c.getString(one) == null || c.getString(one).length() <= 0) {
username.add(null);
} else {
- username.add(c.getString(two));
+ username.add(c.getString(one));
}
}
c.close();
old.close();
} catch(Exception ignored) {
// there's no hope, go ahead and nuke old database.
}
len = ID.size();
- len2 = name.size();
- if(len2 < len) {
- len = len2;
- }
len2 = username.size();
if(len2 < len) {
len = len2;
}
if (len > 0) {
- SQLiteDatabase newdb = this.getWritableDatabase();
+ SQLiteDatabase newdb = this.getWritableDatabase(); // TODO: this crashes WITHOUT ERROR MESSAGES OF ANY KIND.
newdb.beginTransaction();
try {
ContentValues cv;
for (int i = 0; i < len; i++) {
cv = new ContentValues();
cv.put("username", username.get(i));
cv.put("ID", ID.get(i));
newdb.insert("favorites", null, cv);
}
newdb.setTransactionSuccessful();
} finally {
newdb.endTransaction();
}
newdb.close();
}
}
if(!OldDB.destroy(this.c)) {
// TODO: notify user somehow?
Log.e("UserDB", "Failed to delete old database, you should really uninstall and reinstall the app. Unfortunately I have no way to tell the user.");
}
}
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
// nothing to do yet
}
@Override
public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
// nothing to do yet
}
/**
* Gets stop name set by the user.
*
* @param db readable database
* @param stopID stop ID
* @return name set by user, or null if not set\not found
*/
public static String getStopUserName(SQLiteDatabase db, String stopID) {
String username = null;
try {
Cursor c = db.query("favorites", usernameColumnNameAsArray, "ID = ?", new String[] {stopID}, null, null, null, null);
if(c.moveToNext()) {
username = c.getString(c.getColumnIndex("username"));
}
c.close();
} catch(SQLiteException ignored) {}
return username;
}
public static List getFavorites(SQLiteDatabase db, StopsDBInterface dbi) {
List l = new ArrayList<>();
Stop s;
String stopID, stopUserName;
try {
Cursor c = db.query("favorites", getFavoritesColumnNamesAsArray, null, null, null, null, null, null);
int colID = c.getColumnIndex("ID");
int colUser = c.getColumnIndex("username");
while(c.moveToNext()) {
stopUserName = c.getString(colUser);
stopID = c.getString(colID);
s = dbi.getAllFromID(stopID);
if(s == null) {
// can't find it in database
l.add(new Stop(stopUserName, stopID, null, null, null));
} else {
// setStopName() already does sanity checks
s.setStopUserName(stopUserName);
l.add(s);
}
}
c.close();
} catch(SQLiteException ignored) {}
return l;
}
public static boolean addOrUpdateStop(Stop s, SQLiteDatabase db) {
ContentValues cv = new ContentValues();
long result = -1;
cv.put("ID", s.ID);
cv.put("username", getStopUserName(db, s.ID));
try {
result = db.insert("favorites", null, cv);
} catch (SQLiteException ignored) {}
// Android Studio suggested this unreadable replacement: return true if insert succeeded (!= -1), or try to update and return
return (result != -1) || updateStop(s, db);
}
public static boolean updateStop(Stop s, SQLiteDatabase db) {
try {
ContentValues cv = new ContentValues();
cv.put("username", s.getStopUserName());
db.update("favorites", cv, "ID = ?", new String[]{s.ID});
return true;
} catch(SQLiteException e) {
return false;
}
}
public static boolean deleteStop(Stop s, SQLiteDatabase db) {
try {
db.delete("favorites", "ID = ?", new String[]{s.ID});
return true;
} catch(SQLiteException e) {
return false;
}
}
}