Permalink
Browse files

Fix for RTM metadata not getting created at all.

  • Loading branch information...
timsu committed Aug 19, 2010
1 parent bafbf97 commit f9eb247ef6bf8c761c0a54d19041f5876c02ead9
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.timsu.astrid"
- android:versionName="3.2.4 (build your own filters, easy sorting, customizable widget, ui improvements)"
- android:versionCode="151">
+ android:versionName="3.2.5 (build your own filters, easy sorting, customizable widget, ui improvements)"
+ android:versionCode="152">
<!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
<!-- android:installLocation="internalOnly"> -->
@@ -141,6 +141,12 @@ public void findLocalMatch(RTMTaskContainer remoteTask) {
public void saveTaskAndMetadata(RTMTaskContainer task) {
taskDao.save(task.task);
+ Metadata metadata = MilkTask.create(task);
+ Metadata foundMetadata = task.findMetadata(MilkTask.METADATA_KEY);
+ if(foundMetadata != null)
+ foundMetadata.mergeWith(metadata.getMergedValues());
+ else
+ task.metadata.add(metadata);
metadataService.synchronizeMetadata(task.task.getId(), task.metadata,
Criterion.or(MetadataCriteria.withKey(MilkTask.METADATA_KEY),
MetadataCriteria.withKey(MilkNote.METADATA_KEY),
@@ -16,6 +16,7 @@
public final class UpgradeService {
+ private static final int V3_2_4 = 151;
private static final int V3_2_3 = 150;
private static final int V3_1_0 = 146;
private static final int V3_0_6 = 145;
@@ -108,8 +109,12 @@ public void showChangeLog(Context context, int from) {
"If you liked the old version, you can also go back by " +
"<a href='http://bit.ly/oldastrid'>clicking here</a>",
});
+ if(from > V2_14_4 && from <= V3_2_4)
+ newVersionString(changeLog, "3.2.5 (8/18/10)", new String[] {
+ "Fix for duplicated tasks created in RTM",
+ });
if(from > V2_14_4 && from <= V3_2_3)
- newVersionString(changeLog, "3.2.4 (8/18/10)", new String[] {
+ newVersionString(changeLog, "3.2.5 (8/18/10)", new String[] {
"Fix for duplicated tasks created in Producteev",
"Fix for being able to create tasks without title",
});
@@ -121,7 +126,6 @@ public void showChangeLog(Context context, int from) {
"Synchronize with Producteev! (producteev.com)",
"Select tags by drop-down box",
"Cosmetic improvements, calendar & sync bug fixes",
- "... enjoy! - we <3 astrid team",
});
if(from > V2_14_4 && from <= V3_0_6)
newVersionString(changeLog, "3.1.0 (8/9/10)", new String[] {
@@ -132,7 +136,6 @@ public void showChangeLog(Context context, int from) {
"Restored tag hiding when tag begins with underscore (_)",
"FROYO: disabled moving app to SD card, it would break alarms and widget",
"Also gone: a couple force closes, bugs with repeating tasks",
- "... enjoy! - we <3 astrid team",
});
if(from > V2_14_4 && from <= V3_0_5)
newVersionString(changeLog, "3.0.6 (8/4/10)", new String[] {
@@ -145,7 +148,7 @@ public void showChangeLog(Context context, int from) {
if(changeLog.length() == 0)
return;
- changeLog.append("</body></html>");
+ changeLog.append("Enjoy!</body></html>");
String changeLogHtml = "<html><body style='color: white'>" + changeLog;
WebView webView = new WebView(context);

0 comments on commit f9eb247

Please sign in to comment.