series60-remote-commits Mailing List for S60 Software Suite

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 987
          http://series60-remote.svn.sourceforge.net/series60-remote/?rev=987&view=rev
Author:   lukashetzi
Date:     2012-06-25 14:45:08 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
[WIP] Implement an alternative to the contact sync based on the MD5 checksum (the new alternative uses the version of the contact in the android database)

Modified Paths:
--------------
    branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/connection/BaseClientThread.java
    branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactManager.java

Added Paths:
-----------
    branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/
    branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/
    branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/ContactChecksum/
    branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/ContactChecksum/ContactChecksumMethod.java
    branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/VersionDatabase/
    branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/VersionDatabase/DBAdapter.java
    branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/VersionDatabase/VersionDatabaseMethod.java

Modified: branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/connection/BaseClientThread.java
===================================================================

--- branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/connection/BaseClientThread.java	2012-04-08 17:04:18 UTC (rev 986)
+++ branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/connection/BaseClientThread.java	2012-06-25 14:45:08 UTC (rev 987)
@@ -10,6 +10,7 @@
 import com.hetzenecker.openmobilesuite.service.MessageManager;
 import com.hetzenecker.openmobilesuite.service.Statuscodes;
 import com.hetzenecker.openmobilesuite.service.SysinfoManager;
+import com.hetzenecker.openmobilesuite.service.ContactSync.Methods.ContactChecksum.ContactChecksumMethod;
 
 public abstract class BaseClientThread extends Thread {
     private static final String TAG = "OpenMobileSuite|BaseClientThread";
@@ -114,10 +115,12 @@
             mSysinfoManager.sendSysinfo();
             break;
         case Statuscodes.NUM_CONTACTS_REQUEST_HASH_ALL:
-            mContactManager.sendContactHash();
+            //mContactManager.sendContactHash();
+            ContactChecksumMethod.sendContactHash(mContactManager, this);
             break;
         case Statuscodes.NUM_CONTACTS_REQUEST_HASH_SINGLE:
-            mContactManager.sendContactHashSingle();
+            //mContactManager.sendContactHashSingle();
+            ContactChecksumMethod.sendContactHashSingle(mContactManager, this);
             break;
         case Statuscodes.NUM_CONTACTS_REQUEST_CONTACT:
             mContactManager.sendContact(message);

Modified: branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactManager.java
===================================================================
--- branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactManager.java	2012-04-08 17:04:18 UTC (rev 986)
+++ branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactManager.java	2012-06-25 14:45:08 UTC (rev 987)
@@ -51,14 +51,7 @@
 
 public class ContactManager {
     private static final String TAG = "OpenMobileSuite|ContactManager";
-    private static boolean DEBUG = false;
     
-    // For hash functions
-    public static final char CONTACT_SEP = 0x1F; // Unit Separator
-    public static final char ENTRY_SEP = 0x1F; // Unit Separator
-    public static final char FIELD_SEP = 0x1E; // Record Separator
-    public static final char INFO_SEP = 0x1D; // Group Separator
-
     public static enum ModificationType { Add, Remove }
     
     private BaseClientThread mClientThread;
@@ -95,7 +88,7 @@
     	return baos.toByteArray();
     }
     
-    private List<Contact> getContacts() {
+    public List<Contact> getContacts() {
         return getContacts(null);
     }
     
@@ -374,149 +367,13 @@
         }
         mClientThread.send(Statuscodes.NUM_CONTACTS_REPLY_CONTACT_END, String.valueOf(c.id));
     }
-    
-    public String md5(String raw)
-    {
-    	MessageDigest md;
-        try {
-            md = MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-            return null;
-        }
         
-        //Log.e(TAG, "RAW String: " + raw);
-
-        md.reset();
-        md.update(raw.getBytes());
-
-        /*Log.e(TAG, "RAW Bytes: " + raw.getBytes());
-
-        Formatter formatter = new Formatter();
-        for (byte b : raw.getBytes())
-            formatter.format("%02x", b);
-        
-        Log.e(TAG, "RAW HEX Bytes: " + formatter.toString());
-        */
-        byte[] bArr = md.digest();
-        StringBuffer sb = new StringBuffer();
-
-        for (int i = 0; i < bArr.length; i++) 
-        {
-        	int unsigned = bArr[i] & 0xff;
-        	if (unsigned < 0x10)
-        	{
-        	  sb.append("0");
-        	}
-        	sb.append(Integer.toHexString((unsigned)));
-        }
-        
-		return sb.toString();
-    	
-    }
-    
-    public void sendContactHash()
+    public void aaa()
     {
-        String hash = "";
+        ContentResolver cr = mContext.getContentResolver();
+        Cursor people = cr.query(ContactsContract.Contacts.CONTENT_URI, null, null, null, null);
         
         
-        FileWriter fstream;
-        BufferedWriter out = null;
-        
-        // DEBUGGING START
-        if (DEBUG) {
-            try {
-            	Calendar cal = Calendar.getInstance();
-            	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
-            	fstream = new FileWriter("/mnt/sdcard/oms-full-hash-mobile-" + sdf.format(cal.getTime()) + ".txt", false);
-                out = new BufferedWriter(fstream);
-            } catch (IOException e) {
-            }
-        }
-        // DEBUGGING END
-        
-        for(Contact contact : getContacts())
-        {
-            hash += contact.id;
-            hash += FIELD_SEP;
-            
-            
-            // DEBUGGING START
-            if (DEBUG) {
-	            try {
-	                out.write(String.valueOf(contact.id) + FIELD_SEP + "\n");
-	            } catch (IOException e) {
-	            }
-            }
-            // DEBUGGING END
-
-            for (ContactField field : contact.fields())
-            {
-                hash += md5(String.valueOf(field.id) + INFO_SEP + field.account + INFO_SEP + field.type + INFO_SEP + field.location + INFO_SEP + field.custom_location + INFO_SEP + 
-                		field.detail + INFO_SEP + field.custom_detail + INFO_SEP + field.value + INFO_SEP + (field.primary ? "1" : "0"));
-                hash += FIELD_SEP;
-                
-                // DEBUGGING START
-                if (DEBUG) {
-	                try {
-	                    out.write("md5(" + String.valueOf(field.id) + INFO_SEP + field.account + INFO_SEP + field.type + INFO_SEP + field.location + INFO_SEP + field.custom_location + INFO_SEP + 
-	                    		field.detail + INFO_SEP + field.custom_detail + INFO_SEP + field.value + INFO_SEP + (field.primary ? "1" : "0") + ") = ");
-	                    out.write(md5(String.valueOf(field.id) + INFO_SEP + field.account + INFO_SEP + field.type + INFO_SEP + field.location + INFO_SEP + field.custom_location + INFO_SEP + 
-	                    		field.detail + INFO_SEP + field.custom_detail + INFO_SEP + field.value + INFO_SEP + (field.primary ? "1" : "0")));
-	                    out.write(FIELD_SEP + "\n");
-	                } catch (IOException e) {
-	                }
-                }
-                // DEBUGGING END
-            }
-            hash += CONTACT_SEP;
-            
-            // DEBUGGING START
-            if (DEBUG) {
-	            try {
-	                out.write(CONTACT_SEP + "\n\n");
-	            } catch (IOException e) {
-	            }
-            }
-            // DEBUGGING END
-
-        }
-
-	    // DEBUGGING START
-	    if (DEBUG) {
-	        try {
-	        	out.write("\n\n\n--------------\n" + hash);
-	        	out.write("\n\n --> " + md5(hash));
-	            out.close();
-	        } catch (IOException e) {
-	        }
-	    }
-        // DEBUGGING END
-        
-        
-        mClientThread.send(Statuscodes.NUM_CONTACTS_REPLY_HASH_ALL, md5(hash));
     }
 
-    public void sendContactHashSingle() {
-    	List<Contact> contacts = getContacts();
-    	
-        mClientThread.send(Statuscodes.NUM_CONTACTS_REPLY_HASH_SINGLE_START, String.valueOf(contacts.size()));
-
-        String hash;
-                
-        for (Contact contact : contacts) {
-            hash = "";
-            for (ContactField field : contact.fields()) {
-                hash += md5(String.valueOf(field.id) + INFO_SEP + field.account + INFO_SEP + field.type + INFO_SEP + field.location + INFO_SEP + field.custom_location + INFO_SEP + 
-                		field.detail + INFO_SEP + field.custom_detail + INFO_SEP + field.value + INFO_SEP + (field.primary ? "1" : "0"));
-                hash += FIELD_SEP;
-            }
-
-            mClientThread.send(Statuscodes.NUM_CONTACTS_REPLY_HASH_SINGLE_LINE, String.valueOf(contact.id), md5(hash));
-        }
-        
-        mClientThread.send(Statuscodes.NUM_CONTACTS_REPLY_HASH_SINGLE_END);
-    }
-
 }

Added: branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/ContactChecksum/ContactChecksumMethod.java
===================================================================
--- branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/ContactChecksum/ContactChecksumMethod.java	                        (rev 0)
+++ branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/ContactChecksum/ContactChecksumMethod.java	2012-06-25 14:45:08 UTC (rev 987)
@@ -0,0 +1,176 @@
+package com.hetzenecker.openmobilesuite.service.ContactSync.Methods.ContactChecksum;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.List;
+
+import com.hetzenecker.openmobilesuite.connection.BaseClientThread;
+import com.hetzenecker.openmobilesuite.elements.Contact;
+import com.hetzenecker.openmobilesuite.elements.ContactField;
+import com.hetzenecker.openmobilesuite.service.ContactManager;
+import com.hetzenecker.openmobilesuite.service.Statuscodes;
+
+public class ContactChecksumMethod {
+
+    private static boolean DEBUG = false;
+    
+    // For hash functions
+    private static final char CONTACT_SEP = 0x1F; // Unit Separator
+    private static final char ENTRY_SEP = 0x1F; // Unit Separator
+    private static final char FIELD_SEP = 0x1E; // Record Separator
+    private static final char INFO_SEP = 0x1D; // Group Separator
+    
+    private ContactChecksumMethod()
+    {
+    }
+    
+    private static String md5(String raw)
+    {
+        MessageDigest md;
+        try {
+            md = MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return null;
+        }
+        
+        //Log.e(TAG, "RAW String: " + raw);
+
+        md.reset();
+        md.update(raw.getBytes());
+
+        /*Log.e(TAG, "RAW Bytes: " + raw.getBytes());
+
+        Formatter formatter = new Formatter();
+        for (byte b : raw.getBytes())
+            formatter.format("%02x", b);
+        
+        Log.e(TAG, "RAW HEX Bytes: " + formatter.toString());
+        */
+        byte[] bArr = md.digest();
+        StringBuffer sb = new StringBuffer();
+
+        for (int i = 0; i < bArr.length; i++) 
+        {
+            int unsigned = bArr[i] & 0xff;
+            if (unsigned < 0x10)
+            {
+              sb.append("0");
+            }
+            sb.append(Integer.toHexString((unsigned)));
+        }
+        
+        return sb.toString();
+        
+    }
+    
+    public static void sendContactHash(ContactManager cm, BaseClientThread client)
+    {
+        String hash = "";
+        
+        
+        FileWriter fstream;
+        BufferedWriter out = null;
+        
+        // DEBUGGING START
+        if (DEBUG) {
+            try {
+                Calendar cal = Calendar.getInstance();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
+                fstream = new FileWriter("/mnt/sdcard/oms-full-hash-mobile-" + sdf.format(cal.getTime()) + ".txt", false);
+                out = new BufferedWriter(fstream);
+            } catch (IOException e) {
+            }
+        }
+        // DEBUGGING END
+        
+        for(Contact contact : cm.getContacts())
+        {
+            hash += contact.id;
+            hash += FIELD_SEP;
+            
+            
+            // DEBUGGING START
+            if (DEBUG) {
+                try {
+                    out.write(String.valueOf(contact.id) + FIELD_SEP + "\n");
+                } catch (IOException e) {
+                }
+            }
+            // DEBUGGING END
+
+            for (ContactField field : contact.fields())
+            {
+                hash += md5(String.valueOf(field.id) + INFO_SEP + field.account + INFO_SEP + field.type + INFO_SEP + field.location + INFO_SEP + field.custom_location + INFO_SEP + 
+                        field.detail + INFO_SEP + field.custom_detail + INFO_SEP + field.value + INFO_SEP + (field.primary ? "1" : "0"));
+                hash += FIELD_SEP;
+                
+                // DEBUGGING START
+                if (DEBUG) {
+                    try {
+                        out.write("md5(" + String.valueOf(field.id) + INFO_SEP + field.account + INFO_SEP + field.type + INFO_SEP + field.location + INFO_SEP + field.custom_location + INFO_SEP + 
+                                field.detail + INFO_SEP + field.custom_detail + INFO_SEP + field.value + INFO_SEP + (field.primary ? "1" : "0") + ") = ");
+                        out.write(md5(String.valueOf(field.id) + INFO_SEP + field.account + INFO_SEP + field.type + INFO_SEP + field.location + INFO_SEP + field.custom_location + INFO_SEP + 
+                                field.detail + INFO_SEP + field.custom_detail + INFO_SEP + field.value + INFO_SEP + (field.primary ? "1" : "0")));
+                        out.write(FIELD_SEP + "\n");
+                    } catch (IOException e) {
+                    }
+                }
+                // DEBUGGING END
+            }
+            hash += CONTACT_SEP;
+            
+            // DEBUGGING START
+            if (DEBUG) {
+                try {
+                    out.write(CONTACT_SEP + "\n\n");
+                } catch (IOException e) {
+                }
+            }
+            // DEBUGGING END
+
+        }
+
+        // DEBUGGING START
+        if (DEBUG) {
+            try {
+                out.write("\n\n\n--------------\n" + hash);
+                out.write("\n\n --> " + md5(hash));
+                out.close();
+            } catch (IOException e) {
+            }
+        }
+        // DEBUGGING END
+        
+        
+        client.send(Statuscodes.NUM_CONTACTS_REPLY_HASH_ALL, md5(hash));
+    }
+
+    public static void sendContactHashSingle(ContactManager cm, BaseClientThread client) {
+        List<Contact> contacts = cm.getContacts();
+        
+        client.send(Statuscodes.NUM_CONTACTS_REPLY_HASH_SINGLE_START, String.valueOf(contacts.size()));
+
+        String hash;
+                
+        for (Contact contact : contacts) {
+            hash = "";
+            for (ContactField field : contact.fields()) {
+                hash += md5(String.valueOf(field.id) + INFO_SEP + field.account + INFO_SEP + field.type + INFO_SEP + field.location + INFO_SEP + field.custom_location + INFO_SEP + 
+                        field.detail + INFO_SEP + field.custom_detail + INFO_SEP + field.value + INFO_SEP + (field.primary ? "1" : "0"));
+                hash += FIELD_SEP;
+            }
+
+            client.send(Statuscodes.NUM_CONTACTS_REPLY_HASH_SINGLE_LINE, String.valueOf(contact.id), md5(hash));
+        }
+        
+        client.send(Statuscodes.NUM_CONTACTS_REPLY_HASH_SINGLE_END);
+    }
+
+}
\ No newline at end of file

Added: branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/VersionDatabase/DBAdapter.java
===================================================================
--- branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/VersionDatabase/DBAdapter.java	                        (rev 0)
+++ branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/VersionDatabase/DBAdapter.java	2012-06-25 14:45:08 UTC (rev 987)
@@ -0,0 +1,15 @@
+package com.hetzenecker.openmobilesuite.service.ContactSync.Methods.VersionDatabase;
+
+public class DBAdapter {
+    private static final String DATABASE_NAME = "contact_sync_database";
+    private static final String DATABASE_TABLE = "last_synced_versions";
+    private static final int DATABASE_VERSION = 1;
+    
+    public static final String KEY_ROWID = "_id";
+    public static final String KEY_ISBN = "isbn";
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_PUBLISHER = "publisher";
+    private static final String DATABASE_CREATE = "create table titles (_id integer primary key autoincrement, "
+            + "isbn text not null, title text not null, " + "publisher text not null);";
+    //private final Context context;
+}

Added: branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/VersionDatabase/VersionDatabaseMethod.java
===================================================================
--- branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/VersionDatabase/VersionDatabaseMethod.java	                        (rev 0)
+++ branches/work/series60-remote-dbus/mobile/android/src/com/hetzenecker/openmobilesuite/service/ContactSync/Methods/VersionDatabase/VersionDatabaseMethod.java	2012-06-25 14:45:08 UTC (rev 987)
@@ -0,0 +1,5 @@
+package com.hetzenecker.openmobilesuite.service.ContactSync.Methods.VersionDatabase;
+
+public class VersionDatabaseMethod {
+
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2008	Jan	Feb	Mar	Apr	May	Jun	Jul (26)	Aug (11)	Sep (8)	Oct (14)	Nov (7)	Dec (54)
2009	Jan (26)	Feb (33)	Mar (3)	Apr (17)	May (46)	Jun (8)	Jul (24)	Aug (16)	Sep (3)	Oct	Nov (16)	Dec (58)
2010	Jan (14)	Feb (23)	Mar (12)	Apr (35)	May (39)	Jun (14)	Jul (40)	Aug (82)	Sep (25)	Oct (38)	Nov (30)	Dec (3)
2011	Jan (1)	Feb (11)	Mar (9)	Apr (5)	May (4)	Jun (6)	Jul	Aug (24)	Sep (21)	Oct	Nov	Dec (25)
2012	Jan (22)	Feb (16)	Mar (35)	Apr (1)	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec