From deed6fc2c8b1fee86415402f426f7226e0a340f8 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Sat, 29 May 2010 17:46:43 -0700
Subject: [PATCH] Fixed polish strings that were broken, addressing a potential
 NPE

---
 astrid/AndroidManifest.xml                                  | 2 +-
 astrid/res/values-pl/strings.xml                            | 4 ++--
 .../com/timsu/astrid/activities/TaskListSubActivity.java    | 3 +++
 astrid/src/com/todoroo/astrid/service/UpgradeService.java   | 6 +++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 7dc63a8fa..d6e9be809 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionCode="132" android:versionName="2.14.1">
+      android:versionName="2.14.2" android:versionCode="133">
       
     <!-- ============================ Metadata ============================ -->   
       
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index 52cf6332a..402f097ca 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -139,7 +139,7 @@
         <string name="taskList_goalPrefix">Cel</string>
         <string name="taskList_overdueBy">Zaległe od</string>
         <!-- i.e. Finished 4 days ago -->
-        <string name="taskList_completedPrefix">Ukończone %4</string>
+        <string name="taskList_completedPrefix">Ukończone %s</string>
 		<!-- i.e.  Estimated: 4 hours -->
         <string name="taskList_estimatedTimePrefix">Szacunkowo:</string>
         <!-- i.e. Spent: 88 minutes. used to indicate time spent on task -->
@@ -322,7 +322,7 @@
         <string name="sync_progress_repeating">Synchronizacja powtarzalnych zadań</string>
         <string name="sync_progress_localtx">Transmisja: %s</string>
         <string name="sync_progress_localdel">Zadania usunięte lokalnie</string>
-        <string name="sync_progress_remotetx">Odbieranie:% s</string>
+        <string name="sync_progress_remotetx">Odbieranie: %s</string>
         
         <string name="rtm_login_label">Zaloguj się do RTM...</string>
         <string name="rtm_login_error">Przepraszamy, wystąpił błąd weryfikacji danych logowania. Spróbuj ponownie. \ N \ n Komunikat o błędzie:</string>
diff --git a/astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java
index caacf3afe..a84e6f2f3 100644
--- a/astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java
+++ b/astrid/src-legacy/com/timsu/astrid/activities/TaskListSubActivity.java
@@ -603,6 +603,9 @@ public class TaskListSubActivity extends SubActivity {
                 else
                     tasksCursor = getTaskController().getActiveTaskListCursor();
             }
+            // if internal state is compromised, bail out
+            if(tasksCursor == null)
+                return;
             startManagingCursor(tasksCursor);
             context.taskArray = Collections
                     .synchronizedList(getTaskController()
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index e00ff8dd0..fb5371cd9 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -89,10 +89,14 @@ public final class UpgradeService {
                     "Pick a calendar to 'Add to Calendar' (in Settings menu)",
                     "RTM: archived lists are ignored",
                     "Fixed user-reported crashes!"});
-        if(from <= 131)
+        if(from > 130 && from <= 131)
             newVersionString(changeLog, "2.14.1 (5/29/10)", new String[] {
                     "Fixed crash while using PureCalendar widget",
             });
+        if(from > 130 && from <= 132)
+            newVersionString(changeLog, "2.14.2 (5/29/10)", new String[] {
+                    "Fixed crash when Polish version views completed tasks",
+            });
 
         changeLog.append("</body></html>");