BookmarkGateways now accept SQLLiteHelper instead of a BookmarkDB class

diff --git a/client/Android/src/com/freerdp/afreerdp/services/BookmarkBaseGateway.java b/client/Android/src/com/freerdp/afreerdp/services/BookmarkBaseGateway.java
index e600b36..97aefdd 100644 (file)
--- a/client/Android/src/com/freerdp/afreerdp/services/BookmarkBaseGateway.java
+++ b/client/Android/src/com/freerdp/afreerdp/services/BookmarkBaseGateway.java
@@ -18,13 +18,14 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
+import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.util.Log;
 
 public abstract class BookmarkBaseGateway
 {
        private final static String TAG = "BookmarkBaseGateway";
-       private BookmarkDB bookmarkDB;
+       private SQLiteOpenHelper bookmarkDB;
 
        protected abstract BookmarkBase createBookmark();
        protected abstract String getBookmarkTableName();
@@ -32,7 +33,7 @@ public abstract class BookmarkBaseGateway
        protected abstract void addBookmarkSpecificColumns(BookmarkBase bookmark, ContentValues columns);
        protected abstract void readBookmarkSpecificColumns(BookmarkBase bookmark, Cursor cursor);
        
-       public BookmarkBaseGateway(BookmarkDB bookmarkDB)
+       public BookmarkBaseGateway(SQLiteOpenHelper bookmarkDB)
        {
                this.bookmarkDB = bookmarkDB;
        }

diff --git a/client/Android/src/com/freerdp/afreerdp/services/ManualBookmarkGateway.java b/client/Android/src/com/freerdp/afreerdp/services/ManualBookmarkGateway.java
index 97ddfe2..a95f8e4 100644 (file)
--- a/client/Android/src/com/freerdp/afreerdp/services/ManualBookmarkGateway.java
+++ b/client/Android/src/com/freerdp/afreerdp/services/ManualBookmarkGateway.java
@@ -13,13 +13,14 @@ import java.util.ArrayList;
 
 import android.content.ContentValues;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteOpenHelper;
 
 import com.freerdp.afreerdp.domain.BookmarkBase;
 import com.freerdp.afreerdp.domain.ManualBookmark;
 
 public class ManualBookmarkGateway extends BookmarkBaseGateway {
 
-       public ManualBookmarkGateway(BookmarkDB bookmarkDB) {
+       public ManualBookmarkGateway(SQLiteOpenHelper bookmarkDB) {
                super(bookmarkDB);
        }
        

diff --git a/client/Android/src/com/freerdp/afreerdp/services/QuickConnectHistoryGateway.java b/client/Android/src/com/freerdp/afreerdp/services/QuickConnectHistoryGateway.java
index 7e482b3..beb6a59 100644 (file)
--- a/client/Android/src/com/freerdp/afreerdp/services/QuickConnectHistoryGateway.java
+++ b/client/Android/src/com/freerdp/afreerdp/services/QuickConnectHistoryGateway.java
@@ -18,15 +18,16 @@ import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
+import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
 
 public class QuickConnectHistoryGateway {
        private final static String TAG = "QuickConnectHistoryGateway";
-       private HistoryDB historyDB;
+       private SQLiteOpenHelper historyDB;
 
 
-       public QuickConnectHistoryGateway(HistoryDB historyDB)
+       public QuickConnectHistoryGateway(SQLiteOpenHelper historyDB)
        {
                this.historyDB = historyDB;
        }