diff --git a/app/src/main/java/net/nullsum/audinaut/service/sync/SubsonicSyncAdapter.java b/app/src/main/java/net/nullsum/audinaut/service/sync/SubsonicSyncAdapter.java deleted file mode 100644 index b799667..0000000 --- a/app/src/main/java/net/nullsum/audinaut/service/sync/SubsonicSyncAdapter.java +++ /dev/null @@ -1,200 +0,0 @@ -/* - This file is part of Subsonic. - - Subsonic is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Subsonic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Subsonic. If not, see . - - Copyright 2009 (C) Sindre Mehus - */ - -package net.nullsum.audinaut.service.sync; - -import android.accounts.Account; -import android.annotation.TargetApi; -import android.content.AbstractThreadedSyncAdapter; -import android.content.ContentProviderClient; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.SharedPreferences; -import android.content.SyncResult; -import android.os.BatteryManager; -import android.os.Bundle; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.util.Log; - -import java.util.List; - -import net.nullsum.audinaut.domain.MusicDirectory; -import net.nullsum.audinaut.service.CachedMusicService; -import net.nullsum.audinaut.service.DownloadFile; -import net.nullsum.audinaut.service.RESTMusicService; -import net.nullsum.audinaut.util.Constants; -import net.nullsum.audinaut.util.Util; - -/** - * Created by Scott on 9/6/13. - */ - -public class SubsonicSyncAdapter extends AbstractThreadedSyncAdapter { - private static final String TAG = SubsonicSyncAdapter.class.getSimpleName(); - protected CachedMusicService musicService = new CachedMusicService(new RESTMusicService()); - protected boolean tagBrowsing; - private Context context; - - public SubsonicSyncAdapter(Context context, boolean autoInitialize) { - super(context, autoInitialize); - this.context = context; - } - @TargetApi(14) - public SubsonicSyncAdapter(Context context, boolean autoInitialize, boolean allowParallelSyncs) { - super(context, autoInitialize, allowParallelSyncs); - this.context = context; - } - - @Override - public void onPerformSync(Account account, Bundle extras, String authority, ContentProviderClient provider, SyncResult syncResult) { - String invalidMessage = isNetworkValid(); - if(invalidMessage != null) { - Log.w(TAG, "Not running sync: " + invalidMessage); - return; - } - - // Make sure battery > x% or is charging - IntentFilter intentFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED); - Intent batteryStatus = context.registerReceiver(null, intentFilter); - int status = batteryStatus.getIntExtra(BatteryManager.EXTRA_STATUS, -1); - if (status != BatteryManager.BATTERY_STATUS_CHARGING && status != BatteryManager.BATTERY_STATUS_FULL) { - int level = batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, -1); - int scale = batteryStatus.getIntExtra(BatteryManager.EXTRA_SCALE, -1); - - if ((level / (float) scale) < 0.15) { - Log.w(TAG, "Not running sync, battery too low"); - return; - } - } - - executeSync(context); - } - - private String isNetworkValid() { - ConnectivityManager manager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - NetworkInfo networkInfo = manager.getActiveNetworkInfo(); - - // Don't try to sync if no network! - if(networkInfo == null || !networkInfo.isConnected() || Util.isOffline(context)) { - return "Not connected to any network"; - } - - // Check if user wants to only sync on wifi - SharedPreferences prefs = Util.getPreferences(context); - if(prefs.getBoolean(Constants.PREFERENCES_KEY_SYNC_WIFI, true)) { - if(networkInfo.getType() == ConnectivityManager.TYPE_WIFI) { - return null; - } else { - return "Not connected to WIFI"; - } - } else { - return null; - } - } - protected void throwIfNetworkInvalid() throws NetworkNotValidException { - String invalidMessage = isNetworkValid(); - if(invalidMessage != null) { - throw new NetworkNotValidException(invalidMessage); - } - } - - private void executeSync(Context context) { - String className = this.getClass().getSimpleName(); - Log.i(TAG, "Running sync for " + className); - long start = System.currentTimeMillis(); - int servers = Util.getServerCount(context); - try { - for (int i = 1; i <= servers; i++) { - try { - throwIfNetworkInvalid(); - - if (isValidServer(context, i) && Util.isSyncEnabled(context, i)) { - tagBrowsing = Util.isTagBrowsing(context, i); - musicService.setInstance(i); - onExecuteSync(context, i); - } else { - Log.i(TAG, "Skipped sync for " + i); - } - } catch (Exception e) { - Log.e(TAG, "Failed sync for " + className + "(" + i + ")", e); - } - } - } catch (NetworkNotValidException e) { - Log.e(TAG, "Stopped sync due to network loss", e); - } - - Log.i(TAG, className + " executed in " + (System.currentTimeMillis() - start) + " ms"); - } - public void onExecuteSync(Context context, int instance) throws NetworkNotValidException { - - } - - protected boolean downloadRecursively(List paths, MusicDirectory parent, Context context, boolean save) throws Exception,NetworkNotValidException { - boolean downloaded = false; - for (MusicDirectory.Entry song: parent.getChildren(false, true)) { - DownloadFile file = new DownloadFile(context, song, save); - while(!(save && file.isSaved() || !save && file.isCompleteFileAvailable()) && !file.isFailedMax()) { - throwIfNetworkInvalid(); - file.downloadNow(musicService); - if(!file.isFailed()) { - downloaded = true; - } - } - - if(paths != null && file.isCompleteFileAvailable()) { - paths.add(file.getCompleteFile().getPath()); - } - } - - for (MusicDirectory.Entry dir: parent.getChildren(true, false)) { - if(downloadRecursively(paths, getMusicDirectory(dir), context, save)) { - downloaded = true; - } - } - - return downloaded; - } - protected MusicDirectory getMusicDirectory(MusicDirectory.Entry dir) throws Exception{ - String id = dir.getId(); - String name = dir.getTitle(); - - if(tagBrowsing) { - if(dir.getArtist() == null) { - return musicService.getArtist(id, name, true, context, null); - } else { - return musicService.getAlbum(id, name, true, context, null); - } - } else { - return musicService.getMusicDirectory(id, name, true, context, null); - } - } - - private boolean isValidServer(Context context, int instance) { - String url = Util.getRestUrl(context, "null", instance, false); - return !(url.contains("demo.subsonic.org") || url.contains("yourhost")); - } - - public class NetworkNotValidException extends Throwable { - public NetworkNotValidException(String reason) { - super("Not running sync: " + reason); - } - } -} diff --git a/app/src/main/java/net/nullsum/audinaut/util/Constants.java b/app/src/main/java/net/nullsum/audinaut/util/Constants.java index 5a40eb4..e440582 100644 --- a/app/src/main/java/net/nullsum/audinaut/util/Constants.java +++ b/app/src/main/java/net/nullsum/audinaut/util/Constants.java @@ -124,7 +124,6 @@ public final class Constants { public static final String PREFERENCES_KEY_LARGE_ALBUM_ART = "largeAlbumArt"; public static final String PREFERENCES_KEY_PLAYLIST_NAME = "suggestedPlaylistName"; public static final String PREFERENCES_KEY_PLAYLIST_ID = "suggestedPlaylistId"; - public static final String PREFERENCES_KEY_SERVER_SYNC = "serverSync"; public static final String PREFERENCES_KEY_RECENT_COUNT = "mostRecentCount"; public static final String PREFERENCES_KEY_REPLAY_GAIN = "replayGain"; public static final String PREFERENCES_KEY_REPLAY_GAIN_BUMP = "replayGainBump2"; diff --git a/app/src/main/java/net/nullsum/audinaut/util/Util.java b/app/src/main/java/net/nullsum/audinaut/util/Util.java index 7722252..d0e6903 100644 --- a/app/src/main/java/net/nullsum/audinaut/util/Util.java +++ b/app/src/main/java/net/nullsum/audinaut/util/Util.java @@ -17,7 +17,6 @@ */ package net.nullsum.audinaut.util; -import android.annotation.TargetApi; import android.app.Activity; import android.graphics.Color; import android.support.annotation.StringRes; @@ -403,11 +402,6 @@ public final class Util { return true; } - public static boolean isSyncEnabled(Context context, int instance) { - SharedPreferences prefs = getPreferences(context); - return prefs.getBoolean(Constants.PREFERENCES_KEY_SERVER_SYNC + instance, true); - } - public static String getParentFromEntry(Context context, MusicDirectory.Entry entry) { if(Util.isTagBrowsing(context)) { if(!entry.isDirectory()) { @@ -1028,24 +1022,6 @@ public final class Util { ((TextView)dialog.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); } - public static void showHTMLDialog(Context context, int title, int message) { - showHTMLDialog(context, title, context.getResources().getString(message)); - } - public static void showHTMLDialog(Context context, int title, String message) { - AlertDialog dialog = new AlertDialog.Builder(context) - .setIcon(android.R.drawable.ic_dialog_info) - .setTitle(title) - .setMessage(Html.fromHtml(message)) - .setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int i) { - dialog.dismiss(); - } - }) - .show(); - - ((TextView)dialog.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); - } public static void showDetailsDialog(Context context, @StringRes int title, List headers, List details) { List headerStrings = new ArrayList<>(); @@ -1171,7 +1147,6 @@ public final class Util { } } - @TargetApi(8) public static void requestAudioFocus(final Context context) { if (focusListener == null) { final AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);