Rename Apk.version to Apk.versionName

Updates #37.

app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java

@@ -170,7 +170,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
         }
 
         ContentValues values = new ContentValues();
-        values.put(ApkProvider.DataColumns.VERSION, "v1.1");
+        values.put(ApkProvider.DataColumns.VERSION_NAME, "v1.1");
         values.put(ApkProvider.DataColumns.HASH, "xxxxyyyy");
         values.put(ApkProvider.DataColumns.HASH_TYPE, "a hash type");
         TestUtils.insertApk(this, "com.example", 11, values);
@@ -188,7 +188,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
         // so we expect to find each of the ones we inserted above...
         assertEquals("com.example", apk.packageName);
         assertEquals(11, apk.versionCode);
-        assertEquals("v1.1", apk.version);
+        assertEquals("v1.1", apk.versionName);
         assertEquals("xxxxyyyy", apk.hash);
         assertEquals("a hash type", apk.hashType);
 
@@ -206,7 +206,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
 
         // Didn't ask for these fields, so should be their default values...
         assertNull(apkLessFields.hashType);
-        assertNull(apkLessFields.version);
+        assertNull(apkLessFields.versionName);
         assertEquals(0, apkLessFields.versionCode);
 
         Apk notFound = ApkProvider.Helper.find(getMockContext(), "com.doesnt.exist", 1000);

app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java

@@ -132,7 +132,7 @@ public class TestUtils {
 
         // Required fields (NOT NULL in the database).
         values.put(ApkProvider.DataColumns.REPO_ID, 1);
-        values.put(ApkProvider.DataColumns.VERSION, "The good one");
+        values.put(ApkProvider.DataColumns.VERSION_NAME, "The good one");
         values.put(ApkProvider.DataColumns.HASH, "11111111aaaaaaaa");
         values.put(ApkProvider.DataColumns.NAME, "Test Apk");
         values.put(ApkProvider.DataColumns.SIZE, 10000);

app/src/main/java/org/fdroid/fdroid/AppDetails.java

@@ -210,7 +210,7 @@ public class AppDetails extends AppCompatActivity {
             }
 
             holder.version.setText(getString(R.string.version)
-                    + " " + apk.version
+                    + " " + apk.versionName
                     + (apk.versionCode == app.suggestedVercode ? "  ☆" : ""));
 
             holder.status.setText(getInstalledStatus(apk));
@@ -1538,7 +1538,7 @@ public class AppDetails extends AppCompatActivity {
             }
             TextView currentVersion = (TextView) view.findViewById(R.id.current_version);
             if (!appDetails.getApks().isEmpty()) {
-                currentVersion.setText(appDetails.getApks().getItem(0).version + " (" + app.license + ")");
+                currentVersion.setText(appDetails.getApks().getItem(0).versionName + " (" + app.license + ")");
             } else {
                 currentVersion.setVisibility(View.GONE);
                 btMain.setVisibility(View.GONE);

app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java

@@ -96,7 +96,7 @@ public class RepoXMLHandler extends DefaultHandler {
         if (curapk != null) {
             switch (localName) {
                 case "version":
-                    curapk.version = str;
+                    curapk.versionName = str;
                     break;
                 case "versioncode":
                     curapk.versionCode = Utils.parseInt(str, -1);

app/src/main/java/org/fdroid/fdroid/data/Apk.java

@@ -15,7 +15,7 @@ public class Apk extends ValueObject implements Comparable<Apk> {
     public static final int SDK_VERSION_MAX_VALUE = Byte.MAX_VALUE;
 
     public String packageName;
-    public String version;
+    public String versionName;
     public int versionCode;
     public int size; // Size in bytes - 0 means we don't know!
     public long repo; // ID of the repo it comes from
@@ -105,8 +105,8 @@ public class Apk extends ValueObject implements Comparable<Apk> {
                 case ApkProvider.DataColumns.SOURCE_NAME:
                     srcname = cursor.getString(i);
                     break;
-                case ApkProvider.DataColumns.VERSION:
+                case ApkProvider.DataColumns.VERSION_NAME:
-                    version = cursor.getString(i);
+                    versionName = cursor.getString(i);
                     break;
                 case ApkProvider.DataColumns.VERSION_CODE:
                     versionCode = cursor.getInt(i);
@@ -129,7 +129,7 @@ public class Apk extends ValueObject implements Comparable<Apk> {
     public ContentValues toContentValues() {
         ContentValues values = new ContentValues();
         values.put(ApkProvider.DataColumns.PACKAGE_NAME, packageName);
-        values.put(ApkProvider.DataColumns.VERSION, version);
+        values.put(ApkProvider.DataColumns.VERSION_NAME, versionName);
         values.put(ApkProvider.DataColumns.VERSION_CODE, versionCode);
         values.put(ApkProvider.DataColumns.REPO_ID, repo);
         values.put(ApkProvider.DataColumns.HASH, hash);

app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java

@@ -195,7 +195,7 @@ public class ApkProvider extends FDroidProvider {
         String _COUNT_DISTINCT_ID = "countDistinct";
 
         String PACKAGE_NAME    = "id";
-        String VERSION         = "version";
+        String VERSION_NAME    = "version";
         String REPO_ID         = "repo";
         String HASH            = "hash";
         String VERSION_CODE    = "vercode";
@@ -216,8 +216,8 @@ public class ApkProvider extends FDroidProvider {
         String REPO_ADDRESS    = "repoAddress";
 
         String[] ALL = {
-            _ID, PACKAGE_NAME, VERSION, REPO_ID, HASH, VERSION_CODE, NAME, SIZE,
+            _ID, PACKAGE_NAME, VERSION_NAME, REPO_ID, HASH, VERSION_CODE, NAME,
-            SIGNATURE, SOURCE_NAME, MIN_SDK_VERSION, MAX_SDK_VERSION,
+            SIZE, SIGNATURE, SOURCE_NAME, MIN_SDK_VERSION, MAX_SDK_VERSION,
             PERMISSIONS, FEATURES, NATIVE_CODE, HASH_TYPE, ADDED_DATE,
             IS_COMPATIBLE, REPO_VERSION, REPO_ADDRESS, INCOMPATIBLE_REASONS,
         };

app/src/main/java/org/fdroid/fdroid/data/App.java

@@ -275,7 +275,7 @@ public class App extends ValueObject implements Comparable<App> {
 
         final SanitizedFile apkFile = SanitizedFile.knownSanitized(appInfo.publicSourceDir);
         final Apk apk = new Apk();
-        apk.version = packageInfo.versionName;
+        apk.versionName = packageInfo.versionName;
         apk.versionCode = packageInfo.versionCode;
         apk.hashType = "sha256";
         apk.hash = Utils.getBinaryHash(apkFile, apk.hashType);

app/src/main/java/org/fdroid/fdroid/data/AppProvider.java

@@ -379,7 +379,7 @@ public class AppProvider extends FDroidProvider {
 
         private void addSuggestedApkVersionField() {
             addSuggestedApkField(
-                    ApkProvider.DataColumns.VERSION,
+                    ApkProvider.DataColumns.VERSION_NAME,
                     DataColumns.SuggestedApk.VERSION);
         }
 

app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java

@@ -438,7 +438,7 @@ public final class LocalRepoManager {
             tag("web", "web");
             tag("source", "source");
             tag("tracker", "tracker");
-            tag("marketversion", app.installedApk.version);
+            tag("marketversion", app.installedApk.versionName);
             tag("marketvercode", app.installedApk.versionCode);
 
             tagPackage(app);
@@ -449,7 +449,7 @@ public final class LocalRepoManager {
         private void tagPackage(App app) throws IOException {
             serializer.startTag("", "package");
 
-            tag("version", app.installedApk.version);
+            tag("version", app.installedApk.versionName);
             tag("versioncode", app.installedApk.versionCode);
             tag("apkname", app.installedApk.apkName);
             tagHash(app);