From 5c87a5c425ea7898bb43586b2fdefa427186e54c Mon Sep 17 00:00:00 2001
From: Kevin Everets <kevin@everets.org>
Date: Thu, 22 Dec 2011 14:28:25 -0500
Subject: [PATCH] Show the currently installed version (if installed) and
 current version (if hasUpdate)

---
 src/org/fdroid/fdroid/AppListAdapter.java | 22 ++++++++++++++--------
 src/org/fdroid/fdroid/DB.java             |  7 +++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/org/fdroid/fdroid/AppListAdapter.java b/src/org/fdroid/fdroid/AppListAdapter.java
index 0ee3d92e9..d74137d8c 100644
--- a/src/org/fdroid/fdroid/AppListAdapter.java
+++ b/src/org/fdroid/fdroid/AppListAdapter.java
@@ -4,8 +4,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.fdroid.fdroid.R;
-
 import android.content.Context;
 import android.net.Uri;
 import android.view.LayoutInflater;
@@ -61,13 +59,21 @@ public class AppListAdapter extends BaseAdapter {
         name.setText(app.name);
 
         String vs;
-        int numav = app.apks.size();
-        if (numav == 1)
-            vs = mContext.getString(R.string.n_version_available);
-        else
-            vs = mContext.getString(R.string.n_versions_available);
+        if (app.hasUpdates)
+            vs = app.installedVersion + " -> " + app.currentVersion;
+        else if (app.installedVersion != null)
+            vs = app.installedVersion;
+        else {
+            int numav = app.apks.size();
+            if (numav == 1)
+                vs = mContext.getString(R.string.n_version_available);
+            else
+                vs = mContext.getString(R.string.n_versions_available);
+            vs = String.format(vs, numav);
+        }
+
         TextView status = (TextView) v.findViewById(R.id.status);
-        status.setText(String.format(vs, numav));
+        status.setText(vs);
 
         TextView license = (TextView) v.findViewById(R.id.license);
         license.setText(app.license);
diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java
index 89c8fe3f9..066d81d75 100644
--- a/src/org/fdroid/fdroid/DB.java
+++ b/src/org/fdroid/fdroid/DB.java
@@ -37,8 +37,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
 import android.preference.PreferenceManager;
-import android.util.Log;
 import android.text.TextUtils.SimpleStringSplitter;
+import android.util.Log;
 
 public class DB {
 
@@ -94,6 +94,7 @@ public class DB {
         public String sourceURL;
         public String donateURL; // Donate link, or null
         public String installedVersion;
+        public String currentVersion;
         public int installedVerCode;
         public String marketVersion;
         public int marketVercode;
@@ -632,8 +633,10 @@ public class DB {
             Apk curver = app.getCurrentVersion(compatChecker);
             if (curver != null && app.installedVersion != null
                     && !app.installedVersion.equals(curver.version)) {
-                if (app.installedVerCode < curver.vercode)
+                if (app.installedVerCode < curver.vercode) {
                     app.hasUpdates = true;
+                    app.currentVersion = curver.version;
+                }
             }
         }