antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into notification-heart-rating

Browse source
This commit is contained in:
eddyizm 2025-10-05 08:52:17 -07:00
commit 791190f681
No known key found for this signature in database
GPG key ID: CF5F671829E8158A
4 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/com/cappielloantonio/tempo/subsonic/api/system/SystemClient.java
View file

@ -5,6 +5,9 @@ import android.util.Log;
import com.cappielloantonio.tempo.subsonic.RetrofitClient;
import com.cappielloantonio.tempo.subsonic.Subsonic;
import com.cappielloantonio.tempo.subsonic.base.ApiResponse;
import com.cappielloantonio.tempo.util.Preferences;
import java.util.concurrent.TimeUnit;
import retrofit2.Call;
@ -21,7 +24,15 @@ public class SystemClient {
public Call<ApiResponse> ping() {
Log.d(TAG, "ping()");
return systemService.ping(subsonic.getParams());
Call<ApiResponse> pingCall = systemService.ping(subsonic.getParams());
if (Preferences.isInUseServerAddressLocal()) {
pingCall.timeout()
.timeout(1, TimeUnit.SECONDS);
} else {
pingCall.timeout()
.timeout(3, TimeUnit.SECONDS);
}
return pingCall;
}
public Call<ApiResponse> getLicense() {

10
app/src/main/java/com/cappielloantonio/tempo/ui/activity/MainActivity.java
View file

@ -82,6 +82,7 @@ public class MainActivity extends BaseActivity {
@Override
protected void onStart() {
super.onStart();
pingServer();
initService();
}
@ -351,6 +352,7 @@ public class MainActivity extends BaseActivity {
Preferences.switchInUseServerAddress();
App.refreshSubsonicClient();
pingServer();
resetView();
} else {
Preferences.setOpenSubsonic(subsonicResponse.getOpenSubsonic() != null && subsonicResponse.getOpenSubsonic());
}
@ -361,6 +363,7 @@ public class MainActivity extends BaseActivity {
Preferences.switchInUseServerAddress();
App.refreshSubsonicClient();
pingServer();
resetView();
} else {
mainViewModel.ping().observe(this, subsonicResponse -> {
if (subsonicResponse == null) {
@ -376,6 +379,13 @@ public class MainActivity extends BaseActivity {
}
}
private void resetView() {
resetViewModel();
int id = Objects.requireNonNull(navController.getCurrentDestination()).getId();
navController.popBackStack(id, true);
navController.navigate(id);
}
private void getOpenSubsonicExtensions() {
if (Preferences.getToken() != null) {
mainViewModel.getOpenSubsonicExtensions().observe(this, openSubsonicExtensions -> {

3
app/src/main/res/values/strings.xml
View file

@ -312,6 +312,9 @@
<string name="settings_github_link">https://github.com/eddyizm/tempo</string>
<string name="settings_github_summary">Follow the development</string>
<string name="settings_github_title">Github</string>
<string name="settings_support_discussion_link">https://github.com/eddyizm/tempo/discussions</string>
<string name="settings_support_summary">Join community discussions and support</string>
<string name="settings_support_title">User support</string>
<string name="settings_image_size">Set image resolution</string>
<string name="settings_language">Language</string>
<string name="settings_logout_title">Log out</string>

8
app/src/main/res/xml/global_preferences.xml
View file

@ -376,6 +376,14 @@
android:data="@string/settings_github_link" />
</Preference>
<Preference
app:summary="@string/settings_support_summary"
app:title="@string/settings_support_title">
<intent
android:action="android.intent.action.VIEW"
android:data="@string/settings_support_discussion_link" />
</Preference>
<Preference
app:summary="@string/undraw_thanks"
app:title="@string/undraw_page">