Merge branch 'master' of https://github.com/google/iosched into github-master

2 files changed, 2 insertions, 2 deletions

diff --git a/android/src/main/java/com/google/samples/apps/iosched/provider/ScheduleProvider.java b/android/src/main/java/com/google/samples/apps/iosched/provider/ScheduleProvider.java
index d33f3fa..1095d21 100644
--- a/android/src/main/java/com/google/samples/apps/iosched/provider/ScheduleProvider.java
+++ b/android/src/main/java/com/google/samples/apps/iosched/provider/ScheduleProvider.java
@@ -544,7 +544,7 @@ public class ScheduleProvider extends ContentProvider {
     public int delete(Uri uri, String selection, String[] selectionArgs) {
         String accountName = getCurrentAccountName(uri, false);
         LOGV(TAG, "delete(uri=" + uri + ", account=" + accountName + ")");
-        if (uri == ScheduleContract.BASE_CONTENT_URI) {
+        if (uri.equals(ScheduleContract.BASE_CONTENT_URI)) {
             // Handle whole database deletes (e.g. when signing out)
             deleteDatabase();
             notifyChange(uri);
diff --git a/android/src/main/java/com/google/samples/apps/iosched/sync/FeedbackSyncHelper.java b/android/src/main/java/com/google/samples/apps/iosched/sync/FeedbackSyncHelper.java
index 77df3da..37d6836 100644
--- a/android/src/main/java/com/google/samples/apps/iosched/sync/FeedbackSyncHelper.java
+++ b/android/src/main/java/com/google/samples/apps/iosched/sync/FeedbackSyncHelper.java
@@ -54,12 +54,12 @@ public class FeedbackSyncHelper {
                 null,
                 null);
         LOGD(TAG, "Number of unsynced feedbacks: " + c.getCount());
-        List<String> questions = new ArrayList<String>();
         List<String> updatedSessions = new ArrayList<String>();
 
         while (c.moveToNext()) {
             String sessionId = c.getString(c.getColumnIndex(ScheduleContract.Feedback.SESSION_ID));
 
+            List<String> questions = new ArrayList<String>();
             questions.add(c.getString(c.getColumnIndex(ScheduleContract.Feedback.SESSION_RATING)));
             questions.add(c.getString(c.getColumnIndex(ScheduleContract.Feedback.ANSWER_RELEVANCE)));
             questions.add(c.getString(c.getColumnIndex(ScheduleContract.Feedback.ANSWER_CONTENT)));