X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailModel.java;h=92d1505fb0baa159bd38cf2e24b9f003d2ddfa4a;hb=667ce42731c95a98926657fea359b56209f9348e;hp=2a655dccd224b11d537ab24c9a4d89c0bded23b2;hpb=05c2c408dabdda9e042744c5f4e4f126a7fb30d1;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailModel.java index 2a655dcc..92d1505f 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailModel.java @@ -17,6 +17,8 @@ package net.ktnx.mobileledger.ui.profiles; +import android.text.TextUtils; + import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; @@ -24,8 +26,22 @@ import androidx.lifecycle.ViewModel; import net.ktnx.mobileledger.async.SendTransactionTask; import net.ktnx.mobileledger.model.Currency; +import net.ktnx.mobileledger.model.HledgerVersion; import net.ktnx.mobileledger.model.MobileLedgerProfile; +import net.ktnx.mobileledger.utils.Colors; +import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.Misc; +import net.ktnx.mobileledger.utils.NetworkUtil; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.util.Locale; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class ProfileDetailModel extends ViewModel { private static final String HTTPS_URL_START = "https://"; @@ -44,6 +60,9 @@ public class ProfileDetailModel extends ViewModel { private final MutableLiveData authPassword = new MutableLiveData<>(null); private final MutableLiveData preferredAccountsFilter = new MutableLiveData<>(null); private final MutableLiveData themeId = new MutableLiveData<>(-1); + private final MutableLiveData detectedVersion = new MutableLiveData<>(null); + public int initialThemeHue = Colors.DEFAULT_HUE_DEG; + private VersionDetectionThread versionDetectionThread; public ProfileDetailModel() { } String getProfileName() { @@ -127,6 +146,14 @@ public class ProfileDetailModel extends ViewModel { void observeApiVersion(LifecycleOwner lfo, Observer o) { apiVersion.observe(lfo, o); } + HledgerVersion getDetectedVersion() { return detectedVersion.getValue(); } + void setDetectedVersion(HledgerVersion newValue) { + if (!Objects.equals(detectedVersion.getValue(), newValue)) + detectedVersion.setValue(newValue); + } + void observeDetectedVersion(LifecycleOwner lfo, Observer o) { + detectedVersion.observe(lfo, o); + } String getUrl() { return url.getValue(); } @@ -201,7 +228,7 @@ public class ProfileDetailModel extends ViewModel { showCommodityByDefault.setValue(mProfile.getShowCommodityByDefault()); { String comm = mProfile.getDefaultCommodity(); - if (Misc.isEmptyOrNull(comm)) + if (TextUtils.isEmpty(comm)) setDefaultCommodity(null); else setDefaultCommodity(new Currency(-1, comm)); @@ -214,6 +241,7 @@ public class ProfileDetailModel extends ViewModel { authPassword.setValue(mProfile.isAuthEnabled() ? mProfile.getAuthPassword() : ""); preferredAccountsFilter.setValue(mProfile.getPreferredAccountsFilter()); themeId.setValue(mProfile.getThemeHue()); + detectedVersion.setValue(mProfile.getDetectedVersion()); } else { profileName.setValue(null); @@ -228,9 +256,8 @@ public class ProfileDetailModel extends ViewModel { authPassword.setValue(""); preferredAccountsFilter.setValue(null); themeId.setValue(newProfileHue); + detectedVersion.setValue(null); } - - } void updateProfile(MobileLedgerProfile mProfile) { mProfile.setName(profileName.getValue()); @@ -247,5 +274,62 @@ public class ProfileDetailModel extends ViewModel { mProfile.setThemeHue(themeId.getValue()); mProfile.setFutureDates(futureDates.getValue()); mProfile.setApiVersion(apiVersion.getValue()); + mProfile.setDetectedVersion(detectedVersion.getValue()); + } + synchronized public void triggerVersionDetection() { + if (versionDetectionThread != null) + versionDetectionThread.interrupt(); + + versionDetectionThread = new VersionDetectionThread(this); + versionDetectionThread.start(); + } + static class VersionDetectionThread extends Thread { + private final Pattern versionPattern = + Pattern.compile("^\"(\\d+)\\.(\\d+)(?:\\.(\\d+))?\"$"); + private final ProfileDetailModel model; + public VersionDetectionThread(ProfileDetailModel model) { + this.model = model; + } + @Override + public void run() { + try { + HttpURLConnection http = NetworkUtil.prepareConnection(model.getUrl(), "version", + model.getUseAuthentication()); + switch (http.getResponseCode()) { + case 200: + break; + case 404: + model.detectedVersion.postValue(new HledgerVersion(true)); + return; + default: + Logger.debug("profile", String.format(Locale.US, + "HTTP error detecting hledger-web version: [%d] %s", + http.getResponseCode(), http.getResponseMessage())); + model.detectedVersion.postValue(null); + return; + } + InputStream stream = http.getInputStream(); + BufferedReader reader = new BufferedReader(new InputStreamReader(stream)); + String version = reader.readLine(); + Matcher m = versionPattern.matcher(version); + if (m.matches()) { + int major = Integer.parseInt(Objects.requireNonNull(m.group(1))); + int minor = Integer.parseInt(Objects.requireNonNull(m.group(2))); + final boolean hasPatch = m.groupCount() >= 3; + int patch = hasPatch ? Integer.parseInt(Objects.requireNonNull(m.group(3))) : 0; + + model.detectedVersion.postValue( + hasPatch ? new HledgerVersion(major, minor, patch) + : new HledgerVersion(major, minor)); + } + else { + Logger.debug("profile", + String.format("Unrecognised version string '%s'", version)); + } + } + catch (IOException e) { + e.printStackTrace(); + } + } } }