From ee34344d30fded0c3cba2b489a3462b271ff97a8 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Wed, 7 Mar 2012 21:52:47 +0100
Subject: [PATCH] Upgrade to SDK 15

---
 project.properties                            |  2 +-
 src/com/fsck/k9/preferences/Editor.java       |  6 ++++
 src/com/fsck/k9/preferences/Storage.java      |  7 ++++
 src/com/fsck/k9/provider/MessageProvider.java | 32 +++++++++++--------
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/project.properties b/project.properties
index 213821e1f..46fb34716 100644
--- a/project.properties
+++ b/project.properties
@@ -11,5 +11,5 @@
 split.density=false
 java.encoding=utf8
 # Project target.
-target=android-9
+target=android-15
 extensible.libs.classpath=compile-only-libs
diff --git a/src/com/fsck/k9/preferences/Editor.java b/src/com/fsck/k9/preferences/Editor.java
index 412d14ff8..88479d0e2 100644
--- a/src/com/fsck/k9/preferences/Editor.java
+++ b/src/com/fsck/k9/preferences/Editor.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 public class Editor implements android.content.SharedPreferences.Editor {
     private Storage storage;
@@ -138,4 +139,9 @@ public class Editor implements android.content.SharedPreferences.Editor {
         return this;
     }
 
+    @Override
+    public android.content.SharedPreferences.Editor putStringSet(String arg0, Set<String> arg1) {
+        throw new RuntimeException("Not implemented");
+    }
+
 }
diff --git a/src/com/fsck/k9/preferences/Storage.java b/src/com/fsck/k9/preferences/Storage.java
index 34c978754..b9041c8f6 100644
--- a/src/com/fsck/k9/preferences/Storage.java
+++ b/src/com/fsck/k9/preferences/Storage.java
@@ -15,6 +15,7 @@ import java.net.URI;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -399,4 +400,10 @@ public class Storage implements SharedPreferences {
             Log.e(K9.LOG_TAG, "Error writing key '" + key + "', value = '" + value + "'");
         }
     }
+
+
+    @Override
+    public Set<String> getStringSet(String arg0, Set<String> arg1) {
+        throw new RuntimeException("Not implemented");
+    }
 }
diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index 50220c31c..0557575af 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -1,18 +1,5 @@
 package com.fsck.k9.provider;
 
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import android.content.ContentProvider;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -46,6 +33,19 @@ import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.store.LocalStore;
 
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 public class MessageProvider extends ContentProvider {
 
     public static interface MessageColumns extends BaseColumns {
@@ -714,6 +714,12 @@ public class MessageProvider extends ContentProvider {
             checkClosed();
             mCursor.unregisterDataSetObserver(observer);
         }
+
+        @Override
+        public int getType(int columnIndex) {
+            checkClosed();
+            return mCursor.getType(columnIndex);
+        }
     }
 
     protected class ThrottlingQueryHandler implements QueryHandler {