Skip to content

Commit 09a1c19

Browse files
committed
made SQLiteDatabase public constructor
1 parent 35e7517 commit 09a1c19

File tree

12 files changed

+70
-81
lines changed

12 files changed

+70
-81
lines changed

src/info/guardianproject/database/AbstractCursor.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,16 @@
1616

1717
package info.guardianproject.database;
1818

19+
import java.lang.ref.WeakReference;
20+
import java.util.HashMap;
21+
import java.util.Map;
22+
1923
import android.content.ContentResolver;
24+
import android.database.CharArrayBuffer;
2025
import android.net.Uri;
26+
import android.os.Bundle;
2127
import android.util.Config;
2228
import android.util.Log;
23-
import android.os.Bundle;
24-
import android.os.Handler;
25-
import android.os.HandlerThread;
26-
import android.os.Looper;
27-
import android.os.Message;
28-
29-
import java.lang.ref.WeakReference;
30-
import java.lang.UnsupportedOperationException;
31-
import java.util.HashMap;
32-
import java.util.Map;
3329

3430

3531
/**

src/info/guardianproject/database/AbstractWindowedCursor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package info.guardianproject.database;
1818

19+
import android.database.CharArrayBuffer;
20+
1921
/**
2022
* A base class for Cursors that store their data in {@link CursorWindow}s.
2123
*/

src/info/guardianproject/database/BulkCursorToCursorAdaptor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,4 +313,6 @@ public void unregisterDataSetObserver(DataSetObserver observer) {
313313
// TODO Auto-generated method stub
314314

315315
}
316+
317+
316318
}

src/info/guardianproject/database/CharArrayBuffer.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/info/guardianproject/database/Cursor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616

1717
package info.guardianproject.database;
1818

19+
import java.util.Map;
20+
1921
import android.content.ContentResolver;
22+
import android.database.CharArrayBuffer;
2023
import android.net.Uri;
2124
import android.os.Bundle;
2225

23-
import java.util.Map;
24-
2526
/**
2627
* This interface provides random read-write access to the result set returned
2728
* by a database query.

src/info/guardianproject/database/CursorWindow.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package info.guardianproject.database;
1818

1919
import info.guardianproject.database.sqlcipher.SQLiteClosable;
20+
import android.database.CharArrayBuffer;
2021
import android.os.IBinder;
2122
import android.os.Parcel;
2223
import android.os.Parcelable;

src/info/guardianproject/database/CursorWrapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package info.guardianproject.database;
1818

1919
import android.content.ContentResolver;
20+
import android.database.CharArrayBuffer;
2021
import android.net.Uri;
2122
import android.os.Bundle;
2223

@@ -134,9 +135,6 @@ public String getString(int columnIndex) {
134135
return mCursor.getString(columnIndex);
135136
}
136137

137-
public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer) {
138-
mCursor.copyStringToBuffer(columnIndex, buffer);
139-
}
140138

141139
public byte[] getBlob(int columnIndex) {
142140
return mCursor.getBlob(columnIndex);
@@ -335,6 +333,8 @@ public void unregisterDataSetObserver(
335333

336334
}
337335

336+
337+
338338

339339
}
340340

src/info/guardianproject/database/MatrixCursor.java

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import java.util.ArrayList;
2020

2121
import android.database.CharArrayBuffer;
22-
import android.database.ContentObserver;
23-
import android.database.DataSetObserver;
22+
2423

2524
/**
2625
* A mutable cursor implementation backed by an array of {@code Object}s. Use
@@ -280,11 +279,6 @@ public boolean isNull(int column) {
280279
return get(column) == null;
281280
}
282281

283-
@Override
284-
public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer) {
285-
// TODO Auto-generated method stub
286-
287-
}
288282

289283
@Override
290284
public void registerContentObserver(ContentObserver observer) {
@@ -309,4 +303,39 @@ public void unregisterDataSetObserver(DataSetObserver observer) {
309303
// TODO Auto-generated method stub
310304

311305
}
306+
307+
@Override
308+
public void copyStringToBuffer(int columnIndex,
309+
android.database.CharArrayBuffer buffer) {
310+
// TODO Auto-generated method stub
311+
312+
}
313+
314+
@Override
315+
public void registerContentObserver(
316+
android.database.ContentObserver observer) {
317+
// TODO Auto-generated method stub
318+
319+
}
320+
321+
@Override
322+
public void registerDataSetObserver(
323+
android.database.DataSetObserver observer) {
324+
// TODO Auto-generated method stub
325+
326+
}
327+
328+
@Override
329+
public void unregisterContentObserver(
330+
android.database.ContentObserver observer) {
331+
// TODO Auto-generated method stub
332+
333+
}
334+
335+
@Override
336+
public void unregisterDataSetObserver(
337+
android.database.DataSetObserver observer) {
338+
// TODO Auto-generated method stub
339+
340+
}
312341
}

src/info/guardianproject/database/MergeCursor.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import android.database.CharArrayBuffer;
2020

21+
22+
2123
/**
2224
* A convience class that lets you present an array of Cursors as a single linear Cursor.
2325
* The schema of the cursors presented is entirely up to the creator of the MergeCursor, and
@@ -259,11 +261,6 @@ public boolean requery()
259261
private Cursor mCursor; // updated in onMove
260262
private Cursor[] mCursors;
261263

262-
@Override
263-
public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer) {
264-
// TODO Auto-generated method stub
265-
266-
}
267264

268265
@Override
269266
public void registerContentObserver(
@@ -292,4 +289,14 @@ public void unregisterDataSetObserver(
292289
// TODO Auto-generated method stub
293290

294291
}
292+
293+
@Override
294+
public void copyStringToBuffer(int columnIndex,
295+
android.database.CharArrayBuffer buffer) {
296+
// TODO Auto-generated method stub
297+
298+
}
299+
300+
301+
295302
}

src/info/guardianproject/database/sqlcipher/SQLiteCursor.java

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import info.guardianproject.database.*;
2020

21+
import android.database.CharArrayBuffer;
22+
import android.database.ContentObserver;
2123
import android.os.Handler;
2224
import android.os.Message;
2325
import android.os.Process;
@@ -633,24 +635,4 @@ public void unregisterDataSetObserver(
633635

634636
}
635637

636-
@Override
637-
public void copyStringToBuffer(int columnIndex,
638-
android.database.CharArrayBuffer buffer) {
639-
// TODO Auto-generated method stub
640-
641-
}
642-
643-
@Override
644-
public void registerContentObserver(
645-
android.database.ContentObserver observer) {
646-
// TODO Auto-generated method stub
647-
648-
}
649-
650-
@Override
651-
public void unregisterContentObserver(
652-
android.database.ContentObserver observer) {
653-
// TODO Auto-generated method stub
654-
655-
}
656638
}

0 commit comments

Comments
 (0)