From b4e0bde57f530b78a27616b9a66fd4f5bea4ab1c Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Wed, 29 Jun 2016 07:11:57 +1000
Subject: [PATCH] Cleanup for checkstyle

---
 app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java | 1 -
 app/src/main/java/org/fdroid/fdroid/data/DBHelper.java    | 8 +++-----
 .../org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java | 4 ++--
 .../test/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java | 1 -
 .../java/org/fdroid/fdroid/data/FDroidProviderTest.java   | 4 ----
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
index 303943ba2..ed3787c45 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
@@ -8,7 +8,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.util.Log;
 
-import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Schema.ApkTable;
 import org.fdroid.fdroid.data.Schema.ApkTable.Cols;
 import org.fdroid.fdroid.data.Schema.AppTable;
diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
index 677c207e0..b90cb1ad4 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
@@ -329,12 +329,10 @@ class DBHelper extends SQLiteOpenHelper {
             Utils.debugLog(TAG, alter);
             db.execSQL(alter);
 
-            final String update =
-                "UPDATE " + ApkTable.NAME + " SET appId = ( " +
+            final String update = "UPDATE " + ApkTable.NAME + " SET " + ApkTable.Cols.APP_ID + " = ( " +
                     "SELECT app." + AppTable.Cols.ROW_ID + " " +
-                    "FROM " + ApkTable.NAME + " AS app " +
-                    "WHERE " + ApkTable.NAME + "." + ApkTable.Cols.PACKAGE_NAME + " = app." + AppTable.Cols.PACKAGE_NAME + " " +
-                ")";
+                    "FROM " + AppTable.NAME + " AS app " +
+                    "WHERE " + ApkTable.NAME + "." + ApkTable.Cols.PACKAGE_NAME + " = app." + AppTable.Cols.PACKAGE_NAME + ")";
             Log.i(TAG, "Updating foreign key from " + ApkTable.NAME + " to " + AppTable.NAME + " to use numeric foreign key.");
             Utils.debugLog(TAG, update);
             db.execSQL(update);
diff --git a/app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java
index ef5a4f203..00d3d889c 100644
--- a/app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java
@@ -2,13 +2,13 @@
 package org.fdroid.fdroid;
 
 import android.content.ContentValues;
-import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
 import org.fdroid.fdroid.RepoUpdater.UpdateException;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.RepoProvider;
+import org.fdroid.fdroid.data.Schema;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricGradleTestRunner;
@@ -127,7 +127,7 @@ public class AcceptableMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
 
     private void disableRepo(Repo repo) {
         ContentValues values = new ContentValues(1);
-        values.put(RepoProvider.DataColumns.IN_USE, 0);
+        values.put(Schema.RepoTable.Cols.IN_USE, 0);
         RepoProvider.Helper.update(context, repo, values);
     }
 
diff --git a/app/src/test/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
index 3b2468b1f..9b694e863 100644
--- a/app/src/test/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
@@ -19,7 +19,6 @@ import org.junit.Before;
 
 import java.io.File;
 import java.util.List;
-import java.util.UUID;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java
index 713992d4b..ca46c75a5 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java
@@ -1,18 +1,14 @@
 package org.fdroid.fdroid.data;
 
-import android.content.ContentResolver;
 import android.content.ContextWrapper;
 
 import org.fdroid.fdroid.TestUtils;
 import org.junit.After;
 import org.junit.Before;
-import org.mockito.AdditionalAnswers;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowContentResolver;
 
-import static org.mockito.Mockito.mock;
-
 public abstract class FDroidProviderTest {
 
     protected ShadowContentResolver contentResolver;