Permalink
Browse files

moved library files to seperate libraries project

  • Loading branch information...
1 parent 0b15f10 commit 3be6497e9c00876a657267b3b1e9ecf4b453ab6a @daleharvey daleharvey committed Jan 28, 2011
View
@@ -4,5 +4,7 @@
<classpathentry kind="lib" path="lib/commons-compress-1.0.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
+ <classpathentry kind="src" path="/LibCouch"/>
+ <classpathentry kind="src" path="LibCouch_src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -30,4 +30,11 @@
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>LibCouch_src</name>
+ <type>2</type>
+ <locationURI>_android_LibCouch_3466ec49/src</locationURI>
+ </link>
+ </linkedResources>
</projectDescription>
View
@@ -23,7 +23,7 @@
<service android:name="CouchService" android:exported="true" android:enabled="true" android:process=":remote">
<intent-filter>
- <action android:name="com.couchone.couchdb.ICouchService"></action>
+ <action android:name="com.couchone.libcouch.ICouchService"></action>
</intent-filter>
</service>
</application>
View
@@ -9,3 +9,4 @@
# Project target.
target=android-8
+android.library.reference.1=../../Documents/workspace/LibCouch
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,34 +0,0 @@
-package com.couchone.couchdb;
-
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-public class AeSimpleSHA1 {
-
- private static String convertToHex(byte[] data) {
- StringBuffer buf = new StringBuffer();
- for (int i = 0; i < data.length; i++) {
- int halfbyte = (data[i] >>> 4) & 0x0F;
- int two_halfs = 0;
- do {
- if ((0 <= halfbyte) && (halfbyte <= 9))
- buf.append((char) ('0' + halfbyte));
- else
- buf.append((char) ('a' + (halfbyte - 10)));
- halfbyte = data[i] & 0x0F;
- } while(two_halfs++ < 1);
- }
- return buf.toString();
- }
-
- public static String SHA1(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException {
- MessageDigest md;
- md = MessageDigest.getInstance("SHA-1");
- byte[] sha1hash = new byte[40];
- md.update(text.getBytes("iso-8859-1"), 0, text.length());
- sha1hash = md.digest();
- return convertToHex(sha1hash);
- }
-}
-
@@ -1,226 +0,0 @@
-// Copyright 2003-2010 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
-// www.source-code.biz, www.inventec.ch/chdh
-//
-// This module is multi-licensed and may be used under the terms
-// of any of the following licenses:
-//
-// EPL, Eclipse Public License, V1.0 or later, http://www.eclipse.org/legal
-// LGPL, GNU Lesser General Public License, V2.1 or later, http://www.gnu.org/licenses/lgpl.html
-// GPL, GNU General Public License, V2 or later, http://www.gnu.org/licenses/gpl.html
-// AL, Apache License, V2.0 or later, http://www.apache.org/licenses
-// BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php
-//
-// Please contact the author if you need another license.
-// This module is provided "as is", without warranties of any kind.
-
-package com.couchone.couchdb;
-
-/**
-* A Base64 encoder/decoder.
-*
-* <p>
-* This class is used to encode and decode data in Base64 format as described in RFC 1521.
-*
-* <p>
-* Project home page: <a href="http://www.source-code.biz/base64coder/java/">www.source-code.biz/base64coder/java</a><br>
-* Author: Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland<br>
-* Multi-licensed: EPL / LGPL / GPL / AL / BSD.
-*/
-public class Base64Coder {
-
-// The line separator string of the operating system.
-private static final String systemLineSeparator = System.getProperty("line.separator");
-
-// Mapping table from 6-bit nibbles to Base64 characters.
-private static char[] map1 = new char[64];
- static {
- int i=0;
- for (char c='A'; c<='Z'; c++) map1[i++] = c;
- for (char c='a'; c<='z'; c++) map1[i++] = c;
- for (char c='0'; c<='9'; c++) map1[i++] = c;
- map1[i++] = '+'; map1[i++] = '/'; }
-
-// Mapping table from Base64 characters to 6-bit nibbles.
-private static byte[] map2 = new byte[128];
- static {
- for (int i=0; i<map2.length; i++) map2[i] = -1;
- for (int i=0; i<64; i++) map2[map1[i]] = (byte)i; }
-
-/**
-* Encodes a string into Base64 format.
-* No blanks or line breaks are inserted.
-* @param s A String to be encoded.
-* @return A String containing the Base64 encoded data.
-*/
-public static String encodeString (String s) {
- return new String(encode(s.getBytes())); }
-
-/**
-* Encodes a byte array into Base 64 format and breaks the output into lines of 76 characters.
-* This method is compatible with <code>sun.misc.BASE64Encoder.encodeBuffer(byte[])</code>.
-* @param in An array containing the data bytes to be encoded.
-* @return A String containing the Base64 encoded data, broken into lines.
-*/
-public static String encodeLines (byte[] in) {
- return encodeLines(in, 0, in.length, 76, systemLineSeparator); }
-
-/**
-* Encodes a byte array into Base 64 format and breaks the output into lines.
-* @param in An array containing the data bytes to be encoded.
-* @param iOff Offset of the first byte in <code>in</code> to be processed.
-* @param iLen Number of bytes to be processed in <code>in</code>, starting at <code>iOff</code>.
-* @param lineLen Line length for the output data. Should be a multiple of 4.
-* @param lineSeparator The line separator to be used to separate the output lines.
-* @return A String containing the Base64 encoded data, broken into lines.
-*/
-public static String encodeLines (byte[] in, int iOff, int iLen, int lineLen, String lineSeparator) {
- int blockLen = (lineLen*3) / 4;
- if (blockLen <= 0) throw new IllegalArgumentException();
- int lines = (iLen+blockLen-1) / blockLen;
- int bufLen = ((iLen+2)/3)*4 + lines*lineSeparator.length();
- StringBuilder buf = new StringBuilder(bufLen);
- int ip = 0;
- while (ip < iLen) {
- int l = Math.min(iLen-ip, blockLen);
- buf.append (encode(in, iOff+ip, l));
- buf.append (lineSeparator);
- ip += l; }
- return buf.toString(); }
-
-/**
-* Encodes a byte array into Base64 format.
-* No blanks or line breaks are inserted in the output.
-* @param in An array containing the data bytes to be encoded.
-* @return A character array containing the Base64 encoded data.
-*/
-public static char[] encode (byte[] in) {
- return encode(in, 0, in.length); }
-
-/**
-* Encodes a byte array into Base64 format.
-* No blanks or line breaks are inserted in the output.
-* @param in An array containing the data bytes to be encoded.
-* @param iLen Number of bytes to process in <code>in</code>.
-* @return A character array containing the Base64 encoded data.
-*/
-public static char[] encode (byte[] in, int iLen) {
- return encode(in, 0, iLen); }
-
-/**
-* Encodes a byte array into Base64 format.
-* No blanks or line breaks are inserted in the output.
-* @param in An array containing the data bytes to be encoded.
-* @param iOff Offset of the first byte in <code>in</code> to be processed.
-* @param iLen Number of bytes to process in <code>in</code>, starting at <code>iOff</code>.
-* @return A character array containing the Base64 encoded data.
-*/
-public static char[] encode (byte[] in, int iOff, int iLen) {
- int oDataLen = (iLen*4+2)/3; // output length without padding
- int oLen = ((iLen+2)/3)*4; // output length including padding
- char[] out = new char[oLen];
- int ip = iOff;
- int iEnd = iOff + iLen;
- int op = 0;
- while (ip < iEnd) {
- int i0 = in[ip++] & 0xff;
- int i1 = ip < iEnd ? in[ip++] & 0xff : 0;
- int i2 = ip < iEnd ? in[ip++] & 0xff : 0;
- int o0 = i0 >>> 2;
- int o1 = ((i0 & 3) << 4) | (i1 >>> 4);
- int o2 = ((i1 & 0xf) << 2) | (i2 >>> 6);
- int o3 = i2 & 0x3F;
- out[op++] = map1[o0];
- out[op++] = map1[o1];
- out[op] = op < oDataLen ? map1[o2] : '='; op++;
- out[op] = op < oDataLen ? map1[o3] : '='; op++; }
- return out; }
-
-/**
-* Decodes a string from Base64 format.
-* No blanks or line breaks are allowed within the Base64 encoded input data.
-* @param s A Base64 String to be decoded.
-* @return A String containing the decoded data.
-* @throws IllegalArgumentException If the input is not valid Base64 encoded data.
-*/
-public static String decodeString (String s) {
- return new String(decode(s)); }
-
-/**
-* Decodes a byte array from Base64 format and ignores line separators, tabs and blanks.
-* CR, LF, Tab and Space characters are ignored in the input data.
-* This method is compatible with <code>sun.misc.BASE64Decoder.decodeBuffer(String)</code>.
-* @param s A Base64 String to be decoded.
-* @return An array containing the decoded data bytes.
-* @throws IllegalArgumentException If the input is not valid Base64 encoded data.
-*/
-public static byte[] decodeLines (String s) {
- char[] buf = new char[s.length()];
- int p = 0;
- for (int ip = 0; ip < s.length(); ip++) {
- char c = s.charAt(ip);
- if (c != ' ' && c != '\r' && c != '\n' && c != '\t')
- buf[p++] = c; }
- return decode(buf, 0, p); }
-
-/**
-* Decodes a byte array from Base64 format.
-* No blanks or line breaks are allowed within the Base64 encoded input data.
-* @param s A Base64 String to be decoded.
-* @return An array containing the decoded data bytes.
-* @throws IllegalArgumentException If the input is not valid Base64 encoded data.
-*/
-public static byte[] decode (String s) {
- return decode(s.toCharArray()); }
-
-/**
-* Decodes a byte array from Base64 format.
-* No blanks or line breaks are allowed within the Base64 encoded input data.
-* @param in A character array containing the Base64 encoded data.
-* @return An array containing the decoded data bytes.
-* @throws IllegalArgumentException If the input is not valid Base64 encoded data.
-*/
-public static byte[] decode (char[] in) {
- return decode(in, 0, in.length); }
-
-/**
-* Decodes a byte array from Base64 format.
-* No blanks or line breaks are allowed within the Base64 encoded input data.
-* @param in A character array containing the Base64 encoded data.
-* @param iOff Offset of the first character in <code>in</code> to be processed.
-* @param iLen Number of characters to process in <code>in</code>, starting at <code>iOff</code>.
-* @return An array containing the decoded data bytes.
-* @throws IllegalArgumentException If the input is not valid Base64 encoded data.
-*/
-public static byte[] decode (char[] in, int iOff, int iLen) {
- if (iLen%4 != 0) throw new IllegalArgumentException ("Length of Base64 encoded input string is not a multiple of 4.");
- while (iLen > 0 && in[iOff+iLen-1] == '=') iLen--;
- int oLen = (iLen*3) / 4;
- byte[] out = new byte[oLen];
- int ip = iOff;
- int iEnd = iOff + iLen;
- int op = 0;
- while (ip < iEnd) {
- int i0 = in[ip++];
- int i1 = in[ip++];
- int i2 = ip < iEnd ? in[ip++] : 'A';
- int i3 = ip < iEnd ? in[ip++] : 'A';
- if (i0 > 127 || i1 > 127 || i2 > 127 || i3 > 127)
- throw new IllegalArgumentException ("Illegal character in Base64 encoded data.");
- int b0 = map2[i0];
- int b1 = map2[i1];
- int b2 = map2[i2];
- int b3 = map2[i3];
- if (b0 < 0 || b1 < 0 || b2 < 0 || b3 < 0)
- throw new IllegalArgumentException ("Illegal character in Base64 encoded data.");
- int o0 = ( b0 <<2) | (b1>>>4);
- int o1 = ((b1 & 0xf)<<4) | (b2>>>2);
- int o2 = ((b2 & 3)<<6) | b3;
- out[op++] = (byte)o0;
- if (op<oLen) out[op++] = (byte)o1;
- if (op<oLen) out[op++] = (byte)o2; }
- return out; }
-
-// Dummy constructor.
-private Base64Coder() {}
-
-} // end class Base64Coder
@@ -4,6 +4,9 @@
import org.json.JSONException;
import org.json.JSONObject;
+import com.couchone.libcouch.Base64Coder;
+import com.couchone.libcouch.HTTPRequest;
+
import android.util.Log;
public class CouchCtrlListener {
@@ -1,5 +1,8 @@
package com.couchone.couchdb;
+import com.couchone.libcouch.ICouchClient;
+import com.couchone.libcouch.ICouchService;
+
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.ComponentName;
@@ -11,6 +14,7 @@
import android.os.IBinder;
import android.os.Message;
import android.os.RemoteException;
+import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -61,6 +65,7 @@ protected void onDestroy() {
* installation otherwise start the couchdb service
*/
private void attemptLaunch() {
+ Log.v(CouchProcess.TAG, "WORKING ***************");
if (!CouchInstaller.checkInstalled()) {
startActivity(new Intent(this, CouchInstallActivity.class));
} else if (!couchStarted) {
@@ -17,6 +17,7 @@
import android.util.Log;
+import com.couchone.libcouch.HTTPRequest;
import com.google.ase.Exec;
public class CouchProcess {
@@ -8,6 +8,13 @@
import org.json.JSONException;
+import com.couchone.libcouch.AeSimpleSHA1;
+import com.couchone.libcouch.Base64Coder;
+import com.couchone.libcouch.HTTPRequest;
+import com.couchone.libcouch.ICouchClient;
+import com.couchone.libcouch.ICouchService;
+
+
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
@@ -17,6 +24,7 @@
import android.os.Binder;
import android.os.IBinder;
import android.os.RemoteException;
+import android.util.Log;
public class CouchService extends Service {
@@ -170,6 +178,7 @@ private void createUser(String user, String pass) {
private void createIfNotExists(String dbName, String user, String pass) {
try {
String url = couch.url() + dbName;
+ Log.v("TESTING", url);
HTTPRequest res = HTTPRequest.get(couch.url() + dbName, adminHeaders());
if (res.status == 404) {
createUser(user, pass);
Oops, something went wrong.

0 comments on commit 3be6497

Please sign in to comment.