diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java index 6ddb54afa..5b123a3f1 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java @@ -202,7 +202,7 @@ public abstract class Installer { try { activity = (Activity) mContext; } catch (ClassCastException e) { - Log.d(TAG, "F-Droid Privileged can only be uninstalled using an activity!"); + Utils.debugLog(TAG, "F-Droid Privileged can only be uninstalled using an activity!"); return; } diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java index f332c492b..e0808bda7 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java @@ -110,6 +110,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { cursor.moveToFirst(); Apk apk = new Apk(cursor); + cursor.close(); assertEquals("com.example", apk.id); assertEquals(10, apk.vercode); @@ -128,12 +129,14 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { // Should not have inserted anything else, just updated the already existing apk. Cursor allCursor = getMockContentResolver().query(ApkProvider.getContentUri(), allFields, null, null, null); assertResultCount(1, allCursor); + allCursor.close(); Cursor updatedCursor = getMockContentResolver().query(apkUri, allFields, null, null, null); assertResultCount(1, updatedCursor); updatedCursor.moveToFirst(); Apk updatedApk = new Apk(updatedCursor); + updatedCursor.close(); assertEquals("com.example", updatedApk.id); assertEquals(10, updatedApk.vercode); diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java index f7a2bce6e..8339f158d 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java @@ -82,6 +82,7 @@ public class ApkProviderTest extends BaseApkProviderTest { null, null, null); assertResultCount(10, fdroidApks); assertBelongsToApp(fdroidApks, "org.fdroid.fdroid"); + fdroidApks.close(); Cursor exampleApks = getMockContentResolver().query( ApkProvider.getAppUri("com.example"), @@ -89,12 +90,14 @@ public class ApkProviderTest extends BaseApkProviderTest { null, null, null); assertResultCount(10, exampleApks); assertBelongsToApp(exampleApks, "com.example"); + exampleApks.close(); ApkProvider.Helper.deleteApksByApp(getMockContext(), new MockApp("com.example")); Cursor all = queryAllApks(); assertResultCount(10, all); assertBelongsToApp(all, "org.fdroid.fdroid"); + all.close(); } public void testInvalidUpdateUris() { @@ -197,6 +200,7 @@ public class ApkProviderTest extends BaseApkProviderTest { ApkProvider.getRepoUri(REPO_DELETE), getMinimalProjection(), null, null, null); assertResultCount(10, cursor); assertBelongsToRepo(cursor, REPO_DELETE); + cursor.close(); int count = ApkProvider.Helper.deleteApksByRepo(getMockContext(), new MockRepo(REPO_DELETE)); assertEquals(10, count); @@ -205,6 +209,7 @@ public class ApkProviderTest extends BaseApkProviderTest { cursor = getMockContentResolver().query( ApkProvider.getRepoUri(REPO_DELETE), getMinimalProjection(), null, null, null); assertResultCount(0, cursor); + cursor.close(); // The only remaining apks should be those from REPO_KEEP. assertBelongsToRepo(queryAllApks(), REPO_KEEP); @@ -213,6 +218,7 @@ public class ApkProviderTest extends BaseApkProviderTest { public void testQuery() { Cursor cursor = queryAllApks(); assertNotNull(cursor); + cursor.close(); } public void testInsert() { @@ -221,6 +227,7 @@ public class ApkProviderTest extends BaseApkProviderTest { Cursor cursor = queryAllApks(); assertNotNull(cursor); assertEquals(0, cursor.getCount()); + cursor.close(); Apk apk = new MockApk("org.fdroid.fdroid", 13); @@ -247,6 +254,7 @@ public class ApkProviderTest extends BaseApkProviderTest { // APK_ID. cursor.moveToFirst(); Apk toCheck = new Apk(cursor); + cursor.close(); assertEquals("org.fdroid.fdroid", toCheck.id); assertEquals(13, toCheck.vercode); } @@ -264,11 +272,13 @@ public class ApkProviderTest extends BaseApkProviderTest { Cursor allWithCount = getMockContentResolver().query(all, projectionCount, null, null, null); assertResultCount(13, allWithFields); + allWithFields.close(); assertResultCount(1, allWithCount); allWithCount.moveToFirst(); int countColumn = allWithCount.getColumnIndex(ApkProvider.DataColumns._COUNT); assertEquals(13, allWithCount.getInt(countColumn)); + allWithCount.close(); } public void testInsertWithExtraFields() { @@ -309,6 +319,7 @@ public class ApkProviderTest extends BaseApkProviderTest { Cursor cursor = getMockContentResolver().query(uri, projections, null, null, null); cursor.moveToFirst(); Apk apk = new Apk(cursor); + cursor.close(); // These should have quietly been dropped when we tried to save them, // because the provider only knows how to query them (not update them). diff --git a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java index dec8d003d..05ecaa1d1 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java @@ -106,6 +106,7 @@ public class AppProviderTest extends FDroidProviderTest { public void testQuery() { Cursor cursor = queryAllApps(); assertNotNull(cursor); + cursor.close(); } private void insertApps(int count) { @@ -180,6 +181,7 @@ public class AppProviderTest extends FDroidProviderTest { canUpdateIds.add(new App(canUpdateCursor).id); canUpdateCursor.moveToNext(); } + canUpdateCursor.close(); String[] expectedUpdateableIds = { "installed, old version, no ignore", @@ -255,6 +257,7 @@ public class AppProviderTest extends FDroidProviderTest { Cursor cursor = queryAllApps(); assertNotNull(cursor); assertEquals(0, cursor.getCount()); + cursor.close(); // Insert a new record... insertApp("org.fdroid.fdroid", "F-Droid"); @@ -278,6 +281,7 @@ public class AppProviderTest extends FDroidProviderTest { // APP_ID. cursor.moveToFirst(); App app = new App(cursor); + cursor.close(); assertEquals("org.fdroid.fdroid", app.id); assertEquals("F-Droid", app.name); } diff --git a/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java index aef343826..0d1284583 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java @@ -126,6 +126,7 @@ public abstract class FDroidProviderTest extends Provi protected void assertValidUri(Uri uri) { Cursor cursor = getMockContentResolver().query(uri, getMinimalProjection(), null, null, null); assertNotNull(cursor); + cursor.close(); } /** @@ -138,6 +139,7 @@ public abstract class FDroidProviderTest extends Provi protected void assertResultCount(int expectedCount, Uri uri) { Cursor cursor = getMockContentResolver().query(uri, getMinimalProjection(), null, null, null); assertResultCount(expectedCount, cursor); + cursor.close(); } protected void assertResultCount(int expectedCount, List items) { @@ -170,6 +172,7 @@ public abstract class FDroidProviderTest extends Provi assertEquals(appId, cursor.getString(cursor.getColumnIndex(InstalledAppProvider.DataColumns.APP_ID))); assertEquals(versionCode, cursor.getInt(cursor.getColumnIndex(InstalledAppProvider.DataColumns.VERSION_CODE))); assertEquals(versionName, cursor.getString(cursor.getColumnIndex(InstalledAppProvider.DataColumns.VERSION_NAME))); + cursor.close(); } }