1 files changed, 6 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java
index 0f9f6bf..02f48a0 100644
--- a/main/src/cgeo/geocaching/DataStore.java
+++ b/main/src/cgeo/geocaching/DataStore.java
@@ -33,7 +33,7 @@ import org.eclipse.jdt.annotation.Nullable;
 import rx.Observable;
 import rx.Observable.OnSubscribe;
 import rx.Subscriber;
-import rx.android.observables.AndroidObservable;
+import rx.android.app.AppObservable;
 import rx.functions.Action0;
 import rx.functions.Action1;
 import rx.functions.Func0;
@@ -407,7 +407,7 @@ public class DataStore {
      */
     public static void moveDatabase(final Activity fromActivity) {
         final ProgressDialog dialog = ProgressDialog.show(fromActivity, fromActivity.getString(R.string.init_dbmove_dbmove), fromActivity.getString(R.string.init_dbmove_running), true, false);
-        AndroidObservable.bindActivity(fromActivity, Async.fromCallable(new Func0<Boolean>() {
+        AppObservable.bindActivity(fromActivity, Async.fromCallable(new Func0<Boolean>() {
             @Override
             public Boolean call() {
                 if (!LocalStorage.isExternalStorageAvailable()) {
@@ -2946,7 +2946,7 @@ public class DataStore {
     }
 
     public static void saveChangedCache(final Geocache cache) {
-        DataStore.saveCache(cache, cache.getStorageLocation().contains(StorageLocation.DATABASE) ? LoadFlags.SAVE_ALL : EnumSet.of(SaveFlag.CACHE));
+        DataStore.saveCache(cache, cache.inDatabase() ? LoadFlags.SAVE_ALL : EnumSet.of(SaveFlag.CACHE));
     }
 
     private static enum PreparedStatement {
@@ -3001,8 +3001,9 @@ public class DataStore {
 
         private static void clearPreparedStatements() {
             for (final PreparedStatement preparedStatement : statements) {
-                if (preparedStatement.statement != null) {
-                    preparedStatement.statement.close();
+                final SQLiteStatement statement = preparedStatement.statement;
+                if (statement != null) {
+                    statement.close();
                     preparedStatement.statement = null;
                 }
             }