Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-03-01 09:57:57 +01:00
Code Issues Releases Wiki Activity

Merge pull request #176 from ultrasonic/fix-server-version-is-not-updated

Browse Source 
Fix server version is not updated
This commit is contained in:
Yahor Berdnikau 2018-03-18 19:19:50 +01:00 committed by GitHub
commit d102f6d60b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptor.kt
View File

@ -9,7 +9,7 @@ import okhttp3.Response
import org.moire.ultrasonic.api.subsonic.SubsonicAPIVersions import org.moire.ultrasonic.api.subsonic.SubsonicAPIVersions
import java.io.IOException import java.io.IOException
private const val DEFAULT_PEEK_BYTE_COUNT = 100L private const val DEFAULT_PEEK_BYTE_COUNT = 1000L
/** /**
* Special [Interceptor] that adds client supported version to request and tries to update it * Special [Interceptor] that adds client supported version to request and tries to update it

26
ultrasonic/src/main/java/org/moire/ultrasonic/activity/MainActivity.java
View File

@ -36,9 +36,12 @@ import android.widget.TextView;
import org.moire.ultrasonic.R; import org.moire.ultrasonic.R;
import org.moire.ultrasonic.service.DownloadService; import org.moire.ultrasonic.service.DownloadService;
import org.moire.ultrasonic.service.DownloadServiceImpl; import org.moire.ultrasonic.service.DownloadServiceImpl;
import org.moire.ultrasonic.service.MusicService;
import org.moire.ultrasonic.service.MusicServiceFactory;
import org.moire.ultrasonic.util.Constants; import org.moire.ultrasonic.util.Constants;
import org.moire.ultrasonic.util.FileUtil; import org.moire.ultrasonic.util.FileUtil;
import org.moire.ultrasonic.util.MergeAdapter; import org.moire.ultrasonic.util.MergeAdapter;
import org.moire.ultrasonic.util.TabActivityBackgroundTask;
import org.moire.ultrasonic.util.Util; import org.moire.ultrasonic.util.Util;
import java.util.Collections; import java.util.Collections;
@ -165,6 +168,10 @@ public class MainActivity extends SubsonicTabActivity
adapter.addView(videosTitle, false); adapter.addView(videosTitle, false);
adapter.addViews(Collections.singletonList(videosButton), true); adapter.addViews(Collections.singletonList(videosButton), true);
if (Util.isNetworkConnected(this)) {
new PingTask(this, false).execute();
}
} }
list.setAdapter(adapter); list.setAdapter(adapter);
@ -533,4 +540,23 @@ public class MainActivity extends SubsonicTabActivity
intent.putExtra(Constants.INTENT_EXTRA_NAME_VIDEOS, 1); intent.putExtra(Constants.INTENT_EXTRA_NAME_VIDEOS, 1);
startActivityForResultWithoutTransition(this, intent); startActivityForResultWithoutTransition(this, intent);
} }
/**
* Temporary task to make a ping to server to get it supported api version.
*/
private static class PingTask extends TabActivityBackgroundTask<Void> {
PingTask(SubsonicTabActivity activity, boolean changeProgress) {
super(activity, changeProgress);
}
@Override
protected Void doInBackground() throws Throwable {
final MusicService service = MusicServiceFactory.getMusicService(getActivity());
service.ping(getActivity(), null);
return null;
}
@Override
protected void done(Void result) {}
}
} }