Changeset 1676
- Timestamp:
- 02/04/07 15:55:49 (22 months ago)
- Files:
-
- 1 modified
-
plugins/kdepim/src/knotes.cpp (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
plugins/kdepim/src/knotes.cpp
r1675 r1676 33 33 #include "knotes.h" 34 34 #include <glib.h> 35 /*An adapted C++ implementation of RSA Data Securities MD5 algorithm.*/ 36 #include <kmdcodec.h> 35 37 36 38 KNotesDataSource::KNotesDataSource(OSyncMember *m, OSyncHashTable *h) … … 141 143 osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx); 142 144 QMap <KNoteID_t,QString> fNotes; 145 //set Digest to rawResult 146 KMD5::Digest rawResult; 147 KMD5 hash_value; 143 148 144 149 fNotes = kn_iface->notes(); … … 181 186 xmlNode *sum = xmlNewChild(root, NULL, (const xmlChar*)"", NULL); 182 187 QCString utf8str = i.data().utf8(); 183 hash = utf8str;188 hash_value.update(utf8str); 184 189 osxml_node_set(sum, "Summary", utf8str, enc); 185 190 186 191 utf8str = strip_html(kn_iface->text(i.key())).utf8(); 187 hash += utf8str; 192 hash_value.update(utf8str); 193 hash = hash_value.base64Digest (); 188 194 if (utf8str && !utf8str.isEmpty()) { 189 195 xmlNode *body = xmlNewChild(root, NULL, (const xmlChar*)"", NULL); … … 210 216 osync_hashtable_update_hash(hashtable, chg); 211 217 } 218 hash_value.reset(); 212 219 } 213 220 … … 231 238 232 239 QString uid = osync_change_get_uid(chg); 240 241 //set Digest to rawResult 242 KMD5::Digest rawResult; 243 KMD5 hash_value; 233 244 234 245 if (type != CHANGE_DELETED) { … … 279 290 if (kn_iface->status() != DCOPStub::CallSucceeded) 280 291 osync_trace(TRACE_INTERNAL, "ERROR: Unable to hide note"); 281 282 hash = summary + body; 292 hash_value.update(summary); 293 hash_value.update(body); 294 hash = hash_value.base64Digest(); 283 295 osync_change_set_uid(chg, uid); 284 296 osync_change_set_hash(chg, hash); … … 299 311 return false; 300 312 } 301 hash = summary + body; 313 hash_value.update(summary); 314 hash_value.update(body); 315 hash = hash_value.base64Digest(); 302 316 osync_change_set_hash(chg, hash); 303 317 break;
