|
|
@ -67,7 +67,7 @@ public class SettingsAboutFragment extends SettingsNestedFragment {
|
|
|
|
|
|
|
|
|
|
|
|
//Set onClickListener to check for new version
|
|
|
|
//Set onClickListener to check for new version
|
|
|
|
version.setOnPreferenceClickListener(preference -> {
|
|
|
|
version.setOnPreferenceClickListener(preference -> {
|
|
|
|
if (!BuildConfig.DEBUG)
|
|
|
|
if (!BuildConfig.DEBUG && BuildConfig.INCLUDE_UPDATER)
|
|
|
|
checkVersion();
|
|
|
|
checkVersion();
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
});
|
|
|
|
});
|
|
|
@ -101,33 +101,32 @@ public class SettingsAboutFragment extends SettingsNestedFragment {
|
|
|
|
releaseSubscription = updateChecker.checkForApplicationUpdate()
|
|
|
|
releaseSubscription = updateChecker.checkForApplicationUpdate()
|
|
|
|
.subscribeOn(Schedulers.io())
|
|
|
|
.subscribeOn(Schedulers.io())
|
|
|
|
.observeOn(AndroidSchedulers.mainThread())
|
|
|
|
.observeOn(AndroidSchedulers.mainThread())
|
|
|
|
.subscribe(next -> {
|
|
|
|
.subscribe(release -> {
|
|
|
|
//Get version of latest releaseSubscription
|
|
|
|
//Get version of latest release
|
|
|
|
String newVersion = next.getVersion();
|
|
|
|
String newVersion = release.getVersion();
|
|
|
|
newVersion = newVersion.replaceAll("[^\\d.]", "");
|
|
|
|
newVersion = newVersion.replaceAll("[^\\d.]", "");
|
|
|
|
|
|
|
|
|
|
|
|
//Check if latest version is different from current version
|
|
|
|
//Check if latest version is different from current version
|
|
|
|
if (!newVersion.equals(BuildConfig.VERSION_NAME)) {
|
|
|
|
if (!newVersion.equals(BuildConfig.VERSION_NAME)) {
|
|
|
|
String downloadLink = next.getDownloadLink();
|
|
|
|
String downloadLink = release.getDownloadLink();
|
|
|
|
String body = next.getChangeLog();
|
|
|
|
String body = release.getChangeLog();
|
|
|
|
|
|
|
|
|
|
|
|
//Create confirmation window
|
|
|
|
//Create confirmation window
|
|
|
|
new MaterialDialog.Builder(getActivity())
|
|
|
|
new MaterialDialog.Builder(getActivity())
|
|
|
|
.title(getString(R.string.update_check_title))
|
|
|
|
.title(getString(R.string.update_check_title))
|
|
|
|
.content(body)
|
|
|
|
.content(body)
|
|
|
|
.positiveText(getString(R.string.update_check_confirm))
|
|
|
|
.positiveText(getString(R.string.update_check_confirm))
|
|
|
|
.negativeText(getString(R.string.update_check_ignore))
|
|
|
|
.negativeText(getString(R.string.update_check_ignore))
|
|
|
|
.onPositive((dialog, which) -> {
|
|
|
|
.onPositive((dialog, which) -> {
|
|
|
|
// User output that download has started
|
|
|
|
// User output that download has started
|
|
|
|
ToastUtil.showShort(getActivity(), getString(R.string.update_check_download_started));
|
|
|
|
ToastUtil.showShort(getActivity(), getString(R.string.update_check_download_started));
|
|
|
|
// Start download
|
|
|
|
// Start download
|
|
|
|
new UpdateDownloader(getActivity()).execute(downloadLink);
|
|
|
|
new UpdateDownloader(getActivity().getApplicationContext()).execute(downloadLink);
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.show();
|
|
|
|
.show();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
ToastUtil.showShort(getActivity(), getString(R.string.update_check_no_new_updates));
|
|
|
|
ToastUtil.showShort(getActivity(), getString(R.string.update_check_no_new_updates));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}, Throwable::printStackTrace);
|
|
|
|
Throwable::printStackTrace);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|