Skip to content

Commit 501c0cd

Browse files
committed
modified the example to fix NPE
1 parent 521dc0e commit 501c0cd

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/example/SQLDemoActivity.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,17 @@ public void onCreate(Bundle savedInstanceState) {
2121

2222
String password = "foo123";
2323

24+
eventsData = new EventDataSQLHelper(this);
25+
2426
//then you can open the database using a password
2527
SQLiteDatabase db = eventsData.getWritableDatabase(password);
26-
db.close();
2728

28-
eventsData = new EventDataSQLHelper(this);
2929
addEvent("Hello Android Event", password);
3030
Cursor cursor = getEvents(password);
3131
showEvents(cursor);
32+
33+
db.close();
34+
3235
}
3336

3437
@Override

src/info/guardianproject/database/sqlcipher/SQLiteDatabase.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,25 @@ public class SQLiteDatabase extends SQLiteClosable {
7676
public static void loadLibs (Context context)
7777
{
7878

79+
File baseFile = context.getFilesDir();
80+
81+
File libFile = new File(baseFile.getParent(),"lib");
82+
83+
7984
System.loadLibrary("stlport_shared");
8085

8186
System.loadLibrary("sqlcipher");
8287

8388
String soFileName = "libsqlcipher_android";
8489

85-
File baseFile = context.getFilesDir();
8690

8791
File soFile = new File(baseFile,soFileName + ".so");
8892

8993
boolean soLoaded = soFile.exists();
9094

9195
if (!soLoaded)
9296
{
93-
File libFile = new File(baseFile.getParent(),"lib");
97+
libFile = new File(baseFile.getParent(),"lib");
9498
File soSrcFile = new File(libFile,soFileName + "-" + android.os.Build.VERSION.SDK_INT + ".so");
9599

96100
try

0 commit comments

Comments
 (0)