From d7aebaa8e44b491f1b275016391553e0f00e7395 Mon Sep 17 00:00:00 2001 From: Tomer Froumin Date: Sat, 13 Feb 2016 12:43:10 +0200 Subject: [PATCH] Cleanup unused methods --- .../org/xbmc/kore/provider/MediaDatabase.java | 18 ----------------- .../org/xbmc/kore/provider/MediaProvider.java | 20 ------------------- .../java/org/xbmc/kore/ui/RemoteActivity.java | 19 ------------------ .../java/org/xbmc/kore/utils/NetUtils.java | 2 +- 4 files changed, 1 insertion(+), 58 deletions(-) diff --git a/app/src/main/java/org/xbmc/kore/provider/MediaDatabase.java b/app/src/main/java/org/xbmc/kore/provider/MediaDatabase.java index 66bb9e2..08a9a63 100644 --- a/app/src/main/java/org/xbmc/kore/provider/MediaDatabase.java +++ b/app/src/main/java/org/xbmc/kore/provider/MediaDatabase.java @@ -464,24 +464,6 @@ public class MediaDatabase extends SQLiteOpenHelper { } } - private void resetDb(SQLiteDatabase db) { - db.execSQL("DROP TABLE IF EXISTS " + Tables.HOSTS); - db.execSQL("DROP TABLE IF EXISTS " + Tables.MOVIES); - db.execSQL("DROP TABLE IF EXISTS " + Tables.MOVIE_CAST); - db.execSQL("DROP TABLE IF EXISTS " + Tables.TVSHOWS); - db.execSQL("DROP TABLE IF EXISTS " + Tables.TVSHOWS_CAST); - db.execSQL("DROP TABLE IF EXISTS " + Tables.SEASONS); - db.execSQL("DROP TABLE IF EXISTS " + Tables.EPISODES); - db.execSQL("DROP TABLE IF EXISTS " + Tables.ARTISTS); - db.execSQL("DROP TABLE IF EXISTS " + Tables.ALBUMS); - db.execSQL("DROP TABLE IF EXISTS " + Tables.SONGS); - db.execSQL("DROP TABLE IF EXISTS " + Tables.AUDIO_GENRES); - db.execSQL("DROP TABLE IF EXISTS " + Tables.ALBUM_ARTISTS); - db.execSQL("DROP TABLE IF EXISTS " + Tables.ALBUM_GENRES); - db.execSQL("DROP TABLE IF EXISTS " + Tables.MUSIC_VIDEOS); - onCreate(db); - } - /** * Tokens to move from prefix to suffix when sorting titles * diff --git a/app/src/main/java/org/xbmc/kore/provider/MediaProvider.java b/app/src/main/java/org/xbmc/kore/provider/MediaProvider.java index e8ba879..166ec34 100644 --- a/app/src/main/java/org/xbmc/kore/provider/MediaProvider.java +++ b/app/src/main/java/org/xbmc/kore/provider/MediaProvider.java @@ -483,26 +483,6 @@ public class MediaProvider extends ContentProvider { return result; } - /** - * Build a simple {@link SelectionBuilder} to match the requested - * {@link Uri}. This is usually enough to support - * {@link #update}, and {@link #delete} operations. - */ - private SelectionBuilder buildUpdateDeleteSelection(Uri uri) { - final SelectionBuilder builder = new SelectionBuilder(); - final int match = sUriMatcher.match(uri); - switch (match) { - case HOSTS_ID: { - final String hostId = MediaContract.Hosts.getHostId(uri); - return builder.table(MediaDatabase.Tables.HOSTS) - .where(BaseColumns._ID + "=?", hostId); - } - default: { - throw new UnsupportedOperationException("Unsupported uri: " + uri); - } - } - } - /** * Build an advanced {@link SelectionBuilder} to match the requested * {@link Uri}. This is usually only used by {@link #query}, since it diff --git a/app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java b/app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java index fc66476..2f41981 100644 --- a/app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java +++ b/app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java @@ -294,25 +294,6 @@ public class RemoteActivity extends BaseActivity return super.onOptionsItemSelected(item); } - /** - * Issue commands to update the Audio and Video libraries, sequentially - */ - private void updateLibraries() { - final Handler callbackHandler = new Handler(); - VideoLibrary.Scan actionScanVideo = new VideoLibrary.Scan(); - actionScanVideo.execute(hostManager.getConnection(), new ApiCallback() { - @Override - public void onSuccess(String result) { - // Great, now update the Audio library - AudioLibrary.Scan actionScanAudio = new AudioLibrary.Scan(); - actionScanAudio.execute(hostManager.getConnection(), null, callbackHandler); - } - - @Override - public void onError(int errorCode, String description) { } - }, callbackHandler); - } - /** * Callbacks from Send text dialog */ diff --git a/app/src/main/java/org/xbmc/kore/utils/NetUtils.java b/app/src/main/java/org/xbmc/kore/utils/NetUtils.java index b27cac6..aefa505 100644 --- a/app/src/main/java/org/xbmc/kore/utils/NetUtils.java +++ b/app/src/main/java/org/xbmc/kore/utils/NetUtils.java @@ -86,7 +86,7 @@ public class NetUtils { InetAddress inet = InetAddress.getByName(hostAddress); // Send some traffic, with a timeout - boolean reachable = inet.isReachable(1000); + inet.isReachable(1000); ipHostAddress = inet.getHostAddress(); } catch (UnknownHostException e) {