Browse Source

Small Bug fix

lp-tu 10 years ago
parent
commit
fadf0c3d32

+ 10 - 2
src/de/tudarmstadt/informatik/hostage/logging/DatabaseHandler.java

@@ -200,10 +200,14 @@ public class DatabaseHandler extends SQLiteOpenHelper {
     	String selectQuery = "SELECT MIN(" + KEY_ATTACK_ID +") FROM " + TABLE_RECORDS;
         SQLiteDatabase db = this.getReadableDatabase();
         Cursor cursor = db.rawQuery(selectQuery, null);
+        db.close();
         
         if (cursor.moveToFirst()) {
-        	return cursor.getInt(0);
+        	int result = cursor.getInt(0);
+        	cursor.close();
+        	return result;
         } else{
+        	cursor.close();
         	return -1;
         }
     }
@@ -213,10 +217,14 @@ public class DatabaseHandler extends SQLiteOpenHelper {
     	String selectQuery = "SELECT MAX(" + KEY_ATTACK_ID +") FROM " + TABLE_RECORDS;
         SQLiteDatabase db = this.getReadableDatabase();
         Cursor cursor = db.rawQuery(selectQuery, null);
+        db.close();
         
         if (cursor.moveToFirst()) {
-        	return cursor.getInt(0);
+        	int result = cursor.getInt(0);
+        	cursor.close();
+        	return result;
         } else{
+        	cursor.close();
         	return -1;
         }
     }

+ 0 - 1
src/de/tudarmstadt/informatik/hostage/ui/MainActivity.java

@@ -108,7 +108,6 @@ public class MainActivity extends Activity {
 	            startActivity(new Intent(this, AboutActivity.class));
 	            break;
 	        default:
-	            ;
 	    }
         return super.onOptionsItemSelected(item);
 	}

+ 11 - 7
src/de/tudarmstadt/informatik/hostage/ui/ViewLog.java

@@ -59,13 +59,17 @@ public class ViewLog extends Activity {
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		// Handle item selection
-		switch (item.getItemId()) {
-		case R.id.action_settings:
-			startActivity(new Intent(this, SettingsActivity.class));
-		default:
-			return super.onOptionsItemSelected(item);
-		}
+	    // Handle item selection
+	    switch (item.getItemId()) {
+	        case R.id.action_settings:
+	            startActivity(new Intent(this, SettingsActivity.class));
+	            break;
+	        case R.id.action_about:
+	            startActivity(new Intent(this, AboutActivity.class));
+	            break;
+	        default:
+	    }
+        return super.onOptionsItemSelected(item);
 	}
 
 	public void exportDatabase(View view) {