Tie libcouch to specific version of binaries

couchbaselabs · Aug 13, 2011 · 720b797 · 720b797
1 parent 20d9d68
commit 720b797
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/assets/couchbase-1.0-dp-be9fe2f.tgz.jpg b/assets/couchbase-1.0-dp-be9fe2f.tgz.jpg
diff --git a/assets/release-0.1.tgz.jpg b/assets/release-0.1.tgz.jpg
diff --git a/src/com/couchbase/libcouch/CouchDB.java b/src/com/couchbase/libcouch/CouchDB.java
@@ -9,6 +9,7 @@
 
 public class CouchDB {
 
+	private final static String defaultRelease = "couchbase-1.0-dp-be9fe2f";
 	private static String releaseName;
 
 	private static ICouchService couchService;
@@ -35,11 +36,14 @@ public void onServiceDisconnected(ComponentName className) {
 		}
 	};
 
+	public static ServiceConnection getService(Context ctx, ICouchClient client) {
+		return getService(ctx, defaultRelease, client);
+	}
+
 	public static ServiceConnection getService(Context ctx, String release, ICouchClient client) {
 		releaseName = release;
 		couchClient = client;
 		ctx.bindService(new Intent(ctx, CouchService.class), mConnection, Context.BIND_AUTO_CREATE);
 		return mConnection;
 	}
-
 }
diff --git a/src/com/couchbase/libcouch/CouchService.java b/src/com/couchbase/libcouch/CouchService.java
@@ -1,5 +1,7 @@
 package com.couchbase.libcouch;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URL;
@@ -125,7 +127,10 @@ void installCouch(final String pkg) {
 			public void run() {
 				try {
 					CouchInstaller.doInstall(pkg, mHandler, service);
-				} catch (Exception e) {
+				} catch (FileNotFoundException e) {
+					Message.obtain(mHandler, CouchService.ERROR, e).sendToTarget();
+					e.printStackTrace();
+				} catch (IOException e) {
 					e.printStackTrace();
 				}
 			}