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

…b-master
silicon-mountain · Jan 7, 2015 · 267819b · 267819b
2 parents cca0280 + b8b238f
commit 267819b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -544,7 +544,7 @@ public int update(Uri uri, ContentValues values, String selection, String[] sele
     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
@@ -54,12 +54,12 @@ public void sync() {
                 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)));