TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-11 18:54:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid leaking cursor.

Browse Source 
// FREEBIE

Closes #1838
This commit is contained in:
Moxie Marlinspike 2014-08-20 10:35:02 -07:00
parent 7f51f9fd5b
commit 5264ebed67
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/org/thoughtcrime/securesms/database/ApnDatabase.java
View File

@ -37,6 +37,7 @@ import java.security.InvalidParameterException;
*/ */
public class ApnDatabase { public class ApnDatabase {
private static final String TAG = ApnDatabase.class.getSimpleName(); private static final String TAG = ApnDatabase.class.getSimpleName();
private final SQLiteDatabase db; private final SQLiteDatabase db;
private static final String DATABASE_NAME = "apns.db"; private static final String DATABASE_NAME = "apns.db";
@ -77,6 +78,7 @@ public class ApnDatabase {
private ApnDatabase(final Context context) throws IOException { private ApnDatabase(final Context context) throws IOException {
File dbFile = context.getDatabasePath(DATABASE_NAME); File dbFile = context.getDatabasePath(DATABASE_NAME);
if (!dbFile.getParentFile().exists() && !dbFile.getParentFile().mkdir()) { if (!dbFile.getParentFile().exists() && !dbFile.getParentFile().mkdir()) {
throw new IOException("couldn't make databases directory"); throw new IOException("couldn't make databases directory");
} }
@ -84,41 +86,47 @@ public class ApnDatabase {
Util.copy(context.getAssets().open(ASSET_PATH, AssetManager.ACCESS_STREAMING), Util.copy(context.getAssets().open(ASSET_PATH, AssetManager.ACCESS_STREAMING),
new FileOutputStream(dbFile)); new FileOutputStream(dbFile));
db = SQLiteDatabase.openDatabase(context.getDatabasePath(DATABASE_NAME).getPath(), this.db = SQLiteDatabase.openDatabase(context.getDatabasePath(DATABASE_NAME).getPath(),
null, SQLiteDatabase.OPEN_READONLY); null, SQLiteDatabase.OPEN_READONLY);
} }
public MmsCommunication.MmsConnectionParameters getMmsConnectionParameters(final String mccmnc, final String apn) { public MmsCommunication.MmsConnectionParameters getMmsConnectionParameters(final String mccmnc,
final String apn)
{
if (mccmnc == null) throw new InvalidParameterException("mccmnc must not be null"); if (mccmnc == null) throw new InvalidParameterException("mccmnc must not be null");
Cursor cursor = null; Cursor cursor = null;
if (apn != null) { try {
Log.w(TAG, "Querying table for MCC+MNC " + mccmnc + " and APN name " + apn); if (apn != null) {
cursor = db.query(TABLE_NAME, null, Log.w(TAG, "Querying table for MCC+MNC " + mccmnc + " and APN name " + apn);
BASE_SELECTION + " AND " + APN_COLUMN + " = ?", cursor = db.query(TABLE_NAME, null,
new String[]{ mccmnc, apn }, BASE_SELECTION + " AND " + APN_COLUMN + " = ?",
null, null, null); new String[] {mccmnc, apn},
} null, null, null);
}
if (cursor == null || !cursor.moveToFirst()) { if (cursor == null || !cursor.moveToFirst()) {
Log.w(TAG, "Querying table for MCC+MNC " + mccmnc + " without APN name"); Log.w(TAG, "Querying table for MCC+MNC " + mccmnc + " without APN name");
cursor = db.query(TABLE_NAME, null, cursor = db.query(TABLE_NAME, null,
BASE_SELECTION, BASE_SELECTION,
new String[]{ mccmnc }, new String[] {mccmnc},
null, null, null); null, null, null);
} }
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
MmsConnectionParameters params = new MmsConnectionParameters(cursor.getString(cursor.getColumnIndexOrThrow(MMSC_COLUMN)), MmsConnectionParameters params = new MmsConnectionParameters(cursor.getString(cursor.getColumnIndexOrThrow(MMSC_COLUMN)),
cursor.getString(cursor.getColumnIndexOrThrow(MMS_PROXY_COLUMN)), cursor.getString(cursor.getColumnIndexOrThrow(MMS_PROXY_COLUMN)),
cursor.getString(cursor.getColumnIndexOrThrow(MMS_PORT_COLUMN))); cursor.getString(cursor.getColumnIndexOrThrow(MMS_PORT_COLUMN)));
Log.w(TAG, "returning preferred APN " + params.get().get(0)); Log.w(TAG, "Returning preferred APN " + params.get().get(0));
return params; return params;
} }
Log.w(TAG, "No matching APNs found, returning null"); Log.w(TAG, "No matching APNs found, returning null");
return null; return null;
} finally {
if (cursor != null) cursor.close();
}
} }
} }