From efcc7c6d8c4a094e71868b3f2e72c404e5dde83a Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 21 Feb 2011 22:12:00 +0000
Subject: [PATCH] Show whether an apk is from source or a binary on the apk
 list

---
 .gitignore                                |  2 +-
 res/layout/apklistitem.xml                |  4 ++++
 src/org/fdroid/fdroid/AppDetails.java     |  8 +++++++-
 src/org/fdroid/fdroid/DB.java             | 15 ++++++++++++---
 src/org/fdroid/fdroid/RepoXMLHandler.java |  2 ++
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7dd994741..5779a310f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 local.properties
 bin/*
-
+proguard.cfg
diff --git a/res/layout/apklistitem.xml b/res/layout/apklistitem.xml
index 509bfcb12..774fc7557 100644
--- a/res/layout/apklistitem.xml
+++ b/res/layout/apklistitem.xml
@@ -6,6 +6,10 @@
 	<RelativeLayout android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:orientation="vertical">
 
+		<TextView android:id="@+id/buildtype" android:textSize="12sp"
+			android:layout_alignParentRight="true" android:layout_height="wrap_content"
+			android:layout_width="wrap_content" />
+
 		<TextView android:id="@+id/version" android:textStyle="bold"
 			android:singleLine="true" android:ellipsize="marquee"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 6b1e4f850..8d57e7912 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Ciaran Gultnieks, ciaran@ciarang.com
+ * Copyright (C) 2010-11  Ciaran Gultnieks, ciaran@ciarang.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -116,6 +116,12 @@ public class AppDetails extends ListActivity {
             } else {
                 size.setText(getFriendlySize(apk.size));
             }
+            TextView buildtype = (TextView) v.findViewById(R.id.buildtype);
+            if(apk.srcname!=null) {
+                buildtype.setText("source");
+            } else { 
+                buildtype.setText("bin");
+            }
             return v;
         }
     }
diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java
index 28cac2ccf..c51bc3fcc 100644
--- a/src/org/fdroid/fdroid/DB.java
+++ b/src/org/fdroid/fdroid/DB.java
@@ -166,10 +166,14 @@ public class DB {
         public String apkName;
 
         // If null, the apk comes from the same server as the repo index.
-        // Otherwise
-        // this is the complete URL to download the apk from.
+        // Otherwise this is the complete URL to download the apk from.
         public String apkSource;
 
+        // If not null, this is the name of the source tarball for the
+        // application. Null indicates that it's a developer's binary
+        // build - otherwise it's built from source.
+        public String srcname;
+
         // Used internally for tracking during repo updates.
         public boolean updated;
 
@@ -229,7 +233,10 @@ public class DB {
             { "alter table " + TABLE_REPO + " add pubkey string" },
 
             // Version 8...
-            { "alter table " + TABLE_APP + " add donateURL string" } };
+            { "alter table " + TABLE_APP + " add donateURL string" },
+
+            // Version 9...
+            { "alter table " + TABLE_APK + " add srcname string" } };
 
     private class DBHelper extends SQLiteOpenHelper {
 
@@ -421,6 +428,7 @@ public class DB {
                         apk.server = c2.getString(c2.getColumnIndex("server"));
                         apk.hash = c2.getString(c2.getColumnIndex("hash"));
                         apk.sig = c2.getString(c2.getColumnIndex("sig"));
+                        apk.srcname = c2.getString(c2.getColumnIndex("srcname"));
                         apk.size = c2.getInt(c2.getColumnIndex("size"));
                         apk.apkName = c2
                                 .getString(c2.getColumnIndex("apkName"));
@@ -665,6 +673,7 @@ public class DB {
         values.put("server", upapk.server);
         values.put("hash", upapk.hash);
         values.put("sig", upapk.sig);
+        values.put("srcname", upapk.srcname);
         values.put("size", upapk.size);
         values.put("apkName", upapk.apkName);
         values.put("apkSource", upapk.apkSource);
diff --git a/src/org/fdroid/fdroid/RepoXMLHandler.java b/src/org/fdroid/fdroid/RepoXMLHandler.java
index 31f464656..c942643e7 100644
--- a/src/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/src/org/fdroid/fdroid/RepoXMLHandler.java
@@ -113,6 +113,8 @@ public class RepoXMLHandler extends DefaultHandler {
                 curapk.hash = str;
             } else if (curel == "sig") {
                 curapk.sig = str;
+            } else if (curel == "srcname") {
+                curapk.srcname = str;
             } else if (curel == "apkname") {
                 curapk.apkName = str;
             } else if (curel == "apksource") {