Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Cleanup KeepAndroidOpen dialog code

Browse source
This commit is contained in:
Stypox 2026-04-29 14:43:26 +02:00
parent 600f10d24e
commit bcafecf5c6
1 changed files with 34 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

75
app/src/main/java/org/schabi/newpipe/MainActivity.java
View file

@ -984,55 +984,48 @@ public class MainActivity extends AppCompatActivity {
private void showKeepAndroidDialog() { private void showKeepAndroidDialog() {
final var prefs = PreferenceManager.getDefaultSharedPreferences(this); final var prefs = PreferenceManager.getDefaultSharedPreferences(this);
final var lastCheckKey = getString(R.string.kao_last_checked_key);
final var lastCheck = Instant.ofEpochMilli(prefs.getLong(lastCheckKey, 0));
final var now = Instant.now(); final var now = Instant.now();
final var kaoLastCheck = Instant.ofEpochMilli(prefs.getLong(
getString(R.string.kao_last_checked_key),
0
));
final var supportedLannguages = List.of("fr", "de", "ca", "es", "id", "it", "pl", if (lastCheck.plus(30, ChronoUnit.DAYS).isBefore(now)) {
"pt", "cs", "sk", "fa", "ar", "tr", "el", "th", "ru", "uk", "ko", "zh", "ja"); final String detailsUrl = getKeepAndroidOpenDetailsUrl();
final var locale = Localization.getAppLocale(); final var solutionUrl = "https://github.com/woheller69/FreeDroidWarn#solutions";
final String kaoBaseUrl = "https://keepandroidopen.org/";
final String kaoURI;
if (supportedLannguages.contains(locale.getLanguage())) {
if ("zh".equals(locale.getLanguage())) {
kaoURI = kaoBaseUrl + ("TW".equals(locale.getCountry()) ? "zh-TW" : "zh-CN");
} else {
kaoURI = kaoBaseUrl + locale.getLanguage();
}
} else {
kaoURI = kaoBaseUrl;
}
final var solutionURI =
"https://github.com/woheller69/FreeDroidWarn?tab=readme-ov-file#solutions";
if (kaoLastCheck.plus(30, ChronoUnit.DAYS).isBefore(now)) {
final var dialog = new AlertDialog.Builder(this) final var dialog = new AlertDialog.Builder(this)
.setTitle("Keep Android Open") .setTitle("Keep Android Open")
.setCancelable(false) .setCancelable(false)
.setMessage(this.getString(R.string.kao_dialog_warning)) .setMessage(R.string.kao_dialog_warning)
.setPositiveButton(this.getString(android.R.string.ok), (d, w) -> { .setPositiveButton(android.R.string.ok, (d, w) -> prefs.edit()
prefs.edit() .putLong(lastCheckKey, now.toEpochMilli())
.putLong( .apply())
getString(R.string.kao_last_checked_key), .setNeutralButton(R.string.kao_solution, null)
now.toEpochMilli() .setNegativeButton(R.string.kao_dialog_more_info, null)
)
.apply();
})
.setNeutralButton(this.getString(R.string.kao_solution), null)
.setNegativeButton(this.getString(R.string.kao_dialog_more_info), null)
.show(); .show();
// If we use setNeutralButton and etc. dialog will close after pressing the buttons, // If we use setNeutralButton/setNegativeButton, dialog will close after pressing the
// but we want it to close only when positive button is pressed // buttons, but we want it to close only when positive button is pressed
dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
ShareUtils.openUrlInBrowser(this, kaoURI) .setOnClickListener(v -> ShareUtils.openUrlInBrowser(this, detailsUrl));
); dialog.getButton(AlertDialog.BUTTON_NEUTRAL)
dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> .setOnClickListener(v -> ShareUtils.openUrlInBrowser(this, solutionUrl));
ShareUtils.openUrlInBrowser(this, solutionURI) }
); }
@NonNull
private static String getKeepAndroidOpenDetailsUrl() {
final var supportedLanguages = List.of("fr", "de", "ca", "es", "id", "it", "pl",
"pt", "cs", "sk", "fa", "ar", "tr", "el", "th", "ru", "uk", "ko", "zh", "ja");
final String kaoBaseUrl = "https://keepandroidopen.org/";
final var locale = Localization.getAppLocale();
if (supportedLanguages.contains(locale.getLanguage())) {
if ("zh".equals(locale.getLanguage())) {
return kaoBaseUrl + ("TW".equals(locale.getCountry()) ? "zh-TW" : "zh-CN");
} else {
return kaoBaseUrl + locale.getLanguage();
}
} else {
return kaoBaseUrl;
} }
} }
} }