From da159cace22c3a2503e396a3aeef266550334c00 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Sun, 18 Dec 2016 10:12:46 +0100 Subject: [PATCH] Reduce visibility of functions --- .../medialibrary/MediaLibraryBackend.java | 16 ++++++++-------- .../android/medialibrary/MediaScanner.java | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ch/blinkenlights/android/medialibrary/MediaLibraryBackend.java b/src/ch/blinkenlights/android/medialibrary/MediaLibraryBackend.java index 43977b81..66c39a30 100644 --- a/src/ch/blinkenlights/android/medialibrary/MediaLibraryBackend.java +++ b/src/ch/blinkenlights/android/medialibrary/MediaLibraryBackend.java @@ -91,7 +91,7 @@ public class MediaLibraryBackend extends SQLiteOpenHelper { * @param id the song id to query * @return the modification time of this song */ - public long getSongMtime(long id) { + long getSongMtime(long id) { long mtime = 0; Cursor cursor = query(false, MediaLibrary.TABLE_SONGS, new String[]{ MediaLibrary.SongColumns.MTIME }, MediaLibrary.SongColumns._ID+"="+Long.toString(id), null, null, null, null, "1"); if (cursor.moveToFirst()) @@ -108,7 +108,7 @@ public class MediaLibraryBackend extends SQLiteOpenHelper { * @param whereArgs arguments to selection * @return the number of affected rows */ - public int delete(String table, String whereClause, String[] whereArgs) { + int delete(String table, String whereClause, String[] whereArgs) { SQLiteDatabase dbh = getWritableDatabase(); return dbh.delete(table, whereClause, whereArgs); } @@ -122,7 +122,7 @@ public class MediaLibraryBackend extends SQLiteOpenHelper { * @param whereArgs arguments to selection * @return the number of affected rows */ - public int update (String table, ContentValues values, String whereClause, String[] whereArgs) { + int update (String table, ContentValues values, String whereClause, String[] whereArgs) { SQLiteDatabase dbh = getWritableDatabase(); return dbh.update(table, values, whereClause, whereArgs); } @@ -132,7 +132,7 @@ public class MediaLibraryBackend extends SQLiteOpenHelper { * * @param sql the raw sql string */ - public void execSQL(String sql) { + void execSQL(String sql) { getWritableDatabase().execSQL(sql); } @@ -143,7 +143,7 @@ public class MediaLibraryBackend extends SQLiteOpenHelper { * @param nullColumnHack android hackery (see SQLiteDatabase documentation) * @param values the values to insert */ - public long insert (String table, String nullColumnHack, ContentValues values) { + long insert (String table, String nullColumnHack, ContentValues values) { long result = -1; try { result = getWritableDatabase().insertOrThrow(table, nullColumnHack, values); @@ -157,7 +157,7 @@ public class MediaLibraryBackend extends SQLiteOpenHelper { /** * Purges orphaned entries from the media library */ - public void cleanOrphanedEntries() { + void cleanOrphanedEntries() { SQLiteDatabase dbh = getWritableDatabase(); dbh.execSQL("DELETE FROM "+MediaLibrary.TABLE_ALBUMS+" WHERE "+MediaLibrary.AlbumColumns._ID+" NOT IN (SELECT "+MediaLibrary.SongColumns.ALBUM_ID+" FROM "+MediaLibrary.TABLE_SONGS+");"); dbh.execSQL("DELETE FROM "+MediaLibrary.TABLE_GENRES_SONGS+" WHERE "+MediaLibrary.GenreSongColumns.SONG_ID+" NOT IN (SELECT "+MediaLibrary.SongColumns._ID+" FROM "+MediaLibrary.TABLE_SONGS+");"); @@ -175,7 +175,7 @@ public class MediaLibraryBackend extends SQLiteOpenHelper { * @param valuesList an array list of ContentValues to insert * @return the number of inserted rows */ - public int bulkInsert (String table, String nullColumnHack, ArrayList valuesList) { + int bulkInsert (String table, String nullColumnHack, ArrayList valuesList) { SQLiteDatabase dbh = getWritableDatabase(); int count = 0; @@ -202,7 +202,7 @@ public class MediaLibraryBackend extends SQLiteOpenHelper { /** * Wrappr for SQLiteDatabase.query() function */ - public Cursor query (boolean distinct, String table, String[] columns, String selection, String[] selectionArgs, String groupBy, String having, String orderBy, String limit) { + Cursor query (boolean distinct, String table, String[] columns, String selection, String[] selectionArgs, String groupBy, String having, String orderBy, String limit) { if (selection != null) { if (MediaLibrary.VIEW_SONGS_ALBUMS_ARTISTS.equals(table)) { diff --git a/src/ch/blinkenlights/android/medialibrary/MediaScanner.java b/src/ch/blinkenlights/android/medialibrary/MediaScanner.java index cb3c83c5..5314ed59 100644 --- a/src/ch/blinkenlights/android/medialibrary/MediaScanner.java +++ b/src/ch/blinkenlights/android/medialibrary/MediaScanner.java @@ -58,7 +58,7 @@ public class MediaScanner implements Handler.Callback { * * @param backend the backend to use */ - public MediaScanner(MediaLibraryBackend backend) { + MediaScanner(MediaLibraryBackend backend) { mBackend = backend; HandlerThread handlerThread = new HandlerThread("MediaScannerThred", Process.THREAD_PRIORITY_LOWEST); handlerThread.start(); @@ -70,7 +70,7 @@ public class MediaScanner implements Handler.Callback { * * @param dir the directory to scan */ - public void startScan(File dir) { + void startScan(File dir) { mHandler.sendMessage(mHandler.obtainMessage(MSG_SCAN_DIRECTORY, 0, 0, dir)); }