From bb8d54513b40788dda7ab2469d112ea8a1482854 Mon Sep 17 00:00:00 2001
From: Jonas Kalderstam <jonas@kalderstam.se>
Date: Tue, 14 Oct 2014 23:17:56 +0200
Subject: [PATCH] Fix widget plus bug

Widgets would always add to list of latest configured list.

fixes #267
fixes #264

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
---
 app/build.gradle                                  |  4 ++--
 .../notepad/widget/ListWidgetProvider.java        |  4 +++-
 app/src/main/res/layout/changelog.xml             | 15 +++++++++++++++
 app/src/main/res/values/changelog_strings.xml     |  4 ++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a21202f08..736f32ac0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,7 @@ configurations {
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile 'com.android.support:support-v4:19.0.1+'
-    compile 'com.google.android.gms:play-services:5.0.77'
+    compile 'com.google.android.gms:play-services:5.2.08'
     compile 'joda-time:joda-time:2.3'
     // FilePicker
     compile 'com.nononsenseapps:filepicker:1.1.3+'
@@ -64,7 +64,7 @@ dependencies {
 // Version number
 def versionMajor = 5 // Major UI overhauls
 def versionMinor = 4 // Some new functionality
-def versionPatch = 0 // Bug fixes
+def versionPatch = 1 // Bug fixes
 def versionBuild = 0 // Bump for dogfood builds, public betas, etc.
 
 // Version name from git
diff --git a/app/src/main/java/com/nononsenseapps/notepad/widget/ListWidgetProvider.java b/app/src/main/java/com/nononsenseapps/notepad/widget/ListWidgetProvider.java
index 68de8e445..c2fc19827 100644
--- a/app/src/main/java/com/nononsenseapps/notepad/widget/ListWidgetProvider.java
+++ b/app/src/main/java/com/nononsenseapps/notepad/widget/ListWidgetProvider.java
@@ -260,7 +260,9 @@ public static RemoteViews buildRemoteViews(final Context context,
 						Intent.FLAG_ACTIVITY_NEW_TASK
 								| Intent.FLAG_ACTIVITY_CLEAR_TASK)
 				.setClass(context, ActivityMain_.class)
-				.setAction(Intent.ACTION_INSERT).setData(Task.URI)
+                // Append a dummy path so we don't override this intent on 2nd, 3rd, etc, widgets.
+				.setAction(Intent.ACTION_INSERT).setData(Uri.withAppendedPath(Task.URI,
+                "/widget/" + appWidgetId + "/-1"))
 				.putExtra(TaskDetailFragment.ARG_ITEM_LIST_ID, listId);
 
 		PendingIntent createPendingIntent = PendingIntent.getActivity(context,
diff --git a/app/src/main/res/layout/changelog.xml b/app/src/main/res/layout/changelog.xml
index 007d1172e..9f3258c88 100644
--- a/app/src/main/res/layout/changelog.xml
+++ b/app/src/main/res/layout/changelog.xml
@@ -47,6 +47,21 @@
             android:autoLink="web|email|map"
             android:text="http://goo.gl/Ocjjl" />
 
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="\nVersion 5.4.1"
+            android:fontFamily="sans-serif-condensed"
+            android:textColor="@android:color/holo_blue_dark"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:text="@string/changelog_5.4.1" />
+
         <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/changelog_strings.xml b/app/src/main/res/values/changelog_strings.xml
index ef40c808b..5871e9548 100644
--- a/app/src/main/res/values/changelog_strings.xml
+++ b/app/src/main/res/values/changelog_strings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="changelog_5.4.1">
+\nFixed bug with multiple widget where the plus icon would always add notes to the last configured list
+\nTranslations</string>
+
     <string name="changelog_5.4">
 \nRemoved ability to donate and unlocked themes for everyone
 \nTranslations</string>