Update version and close database properly

markwinter · Sep 7, 2014 · d8eca5e · d8eca5e
1 parent 21e519b
commit d8eca5e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="im.tox.antox"
-    android:versionCode="30"
-    android:versionName="0.12.2" >
+    android:versionCode="31"
+    android:versionName="0.12.3" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/app/src/main/java/im/tox/antox/activities/CreateAcccountActivity.java b/app/src/main/java/im/tox/antox/activities/CreateAcccountActivity.java
@@ -110,6 +110,7 @@ public void onClickRegisterAccount(View view) {
                 // Add user to DB
                 UserDB db = new UserDB(this);
                 db.addUser(account, "");
+                db.close();
 
                 // Create a tox data file
                 String ID = "";

diff --git a/app/src/main/java/im/tox/antox/activities/LoginActivity.java b/app/src/main/java/im/tox/antox/activities/LoginActivity.java
@@ -68,6 +68,7 @@ public void onClickLogin(View view) {
             if(db.login(account)) {
                 /* Set that we're logged in and active user's details*/
                 String[] details = db.getUserDetails(account);
+                db.close();
                 SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
                 SharedPreferences.Editor editor = preferences.edit();
                 editor.putBoolean("loggedin", true);
@@ -93,8 +94,6 @@ public void onClickLogin(View view) {
                 Toast toast = Toast.makeText(context, text, duration);
                 toast.show();
             }
-
-            db.close();
         }
     }
 

diff --git a/app/src/main/java/im/tox/antox/data/UserDB.java b/app/src/main/java/im/tox/antox/data/UserDB.java
@@ -62,11 +62,14 @@ public boolean login(String username) {
         cursor.moveToFirst();
         int count = cursor.getInt(0);
         cursor.close();
+        db.close();
 
         if(count > 0)
             return true;
 
         return false;
+
+
     }
 
     public String[] getUserDetails(String username) {