X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailModel.java;h=e1f956acb3b7e52ccde9ab59b2601ce4fcdeb0d6;hb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;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..e1f956ac 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,33 +17,53 @@ package net.ktnx.mobileledger.ui.profiles; +import android.text.TextUtils; + import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModel; -import net.ktnx.mobileledger.async.SendTransactionTask; -import net.ktnx.mobileledger.model.Currency; -import net.ktnx.mobileledger.model.MobileLedgerProfile; +import net.ktnx.mobileledger.App; +import net.ktnx.mobileledger.db.Profile; +import net.ktnx.mobileledger.json.API; +import net.ktnx.mobileledger.model.FutureDates; +import net.ktnx.mobileledger.model.HledgerVersion; +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://"; private final MutableLiveData profileName = new MutableLiveData<>(); private final MutableLiveData postingPermitted = new MutableLiveData<>(true); - private final MutableLiveData defaultCommodity = new MutableLiveData<>(null); - private final MutableLiveData futureDates = - new MutableLiveData<>(MobileLedgerProfile.FutureDates.None); + private final MutableLiveData defaultCommodity = new MutableLiveData<>(null); + private final MutableLiveData futureDates = + new MutableLiveData<>(FutureDates.None); private final MutableLiveData showCommodityByDefault = new MutableLiveData<>(false); private final MutableLiveData showCommentsByDefault = new MutableLiveData<>(true); private final MutableLiveData useAuthentication = new MutableLiveData<>(false); - private final MutableLiveData apiVersion = - new MutableLiveData<>(SendTransactionTask.API.auto); + private final MutableLiveData apiVersion = new MutableLiveData<>(API.auto); private final MutableLiveData url = new MutableLiveData<>(null); private final MutableLiveData authUserName = new MutableLiveData<>(null); 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); + private final MutableLiveData detectingHledgerVersion = new MutableLiveData<>(false); + public int initialThemeHue = Colors.DEFAULT_HUE_DEG; + private VersionDetectionThread versionDetectionThread; public ProfileDetailModel() { } String getProfileName() { @@ -77,24 +97,24 @@ public class ProfileDetailModel extends ViewModel { void observeShowCommentsByDefault(LifecycleOwner lfo, Observer o) { showCommentsByDefault.observe(lfo, o); } - MobileLedgerProfile.FutureDates getFutureDates() { + FutureDates getFutureDates() { return futureDates.getValue(); } - void setFutureDates(MobileLedgerProfile.FutureDates newValue) { + void setFutureDates(FutureDates newValue) { if (newValue != futureDates.getValue()) futureDates.setValue(newValue); } - void observeFutureDates(LifecycleOwner lfo, Observer o) { + void observeFutureDates(LifecycleOwner lfo, Observer o) { futureDates.observe(lfo, o); } - Currency getDefaultCommodity() { + String getDefaultCommodity() { return defaultCommodity.getValue(); } - void setDefaultCommodity(Currency newValue) { - if (newValue != defaultCommodity.getValue()) + void setDefaultCommodity(String newValue) { + if (!Misc.equalStrings(newValue, defaultCommodity.getValue())) defaultCommodity.setValue(newValue); } - void observeDefaultCommodity(LifecycleOwner lfo, Observer o) { + void observeDefaultCommodity(LifecycleOwner lfo, Observer o) { defaultCommodity.observe(lfo, o); } Boolean getShowCommodityByDefault() { @@ -107,7 +127,7 @@ public class ProfileDetailModel extends ViewModel { void observeShowCommodityByDefault(LifecycleOwner lfo, Observer o) { showCommodityByDefault.observe(lfo, o); } - Boolean getUseAuthentication() { + public Boolean getUseAuthentication() { return useAuthentication.getValue(); } void setUseAuthentication(boolean newValue) { @@ -117,17 +137,25 @@ public class ProfileDetailModel extends ViewModel { void observeUseAuthentication(LifecycleOwner lfo, Observer o) { useAuthentication.observe(lfo, o); } - SendTransactionTask.API getApiVersion() { + API getApiVersion() { return apiVersion.getValue(); } - void setApiVersion(SendTransactionTask.API newValue) { + void setApiVersion(API newValue) { if (newValue != apiVersion.getValue()) apiVersion.setValue(newValue); } - void observeApiVersion(LifecycleOwner lfo, Observer o) { + void observeApiVersion(LifecycleOwner lfo, Observer o) { apiVersion.observe(lfo, o); } - String getUrl() { + 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); + } + public String getUrl() { return url.getValue(); } void setUrl(String newValue) { @@ -141,7 +169,7 @@ public class ProfileDetailModel extends ViewModel { void observeUrl(LifecycleOwner lfo, Observer o) { url.observe(lfo, o); } - String getAuthUserName() { + public String getAuthUserName() { return authUserName.getValue(); } void setAuthUserName(String newValue) { @@ -155,7 +183,7 @@ public class ProfileDetailModel extends ViewModel { void observeUserName(LifecycleOwner lfo, Observer o) { authUserName.observe(lfo, o); } - String getAuthPassword() { + public String getAuthPassword() { return authPassword.getValue(); } void setAuthPassword(String newValue) { @@ -192,28 +220,35 @@ public class ProfileDetailModel extends ViewModel { void observeThemeId(LifecycleOwner lfo, Observer o) { themeId.observe(lfo, o); } - void setValuesFromProfile(MobileLedgerProfile mProfile, int newProfileHue) { - final int profileThemeId; + void observeDetectingHledgerVersion(LifecycleOwner lfo, Observer o) { + detectingHledgerVersion.observe(lfo, o); + } + void setValuesFromProfile(Profile mProfile) { if (mProfile != null) { profileName.setValue(mProfile.getName()); - postingPermitted.setValue(mProfile.isPostingPermitted()); + postingPermitted.setValue(mProfile.permitPosting()); showCommentsByDefault.setValue(mProfile.getShowCommentsByDefault()); showCommodityByDefault.setValue(mProfile.getShowCommodityByDefault()); { String comm = mProfile.getDefaultCommodity(); - if (Misc.isEmptyOrNull(comm)) + if (TextUtils.isEmpty(comm)) setDefaultCommodity(null); else - setDefaultCommodity(new Currency(-1, comm)); + setDefaultCommodity(comm); } - futureDates.setValue(mProfile.getFutureDates()); - apiVersion.setValue(mProfile.getApiVersion()); + futureDates.setValue( + FutureDates.valueOf(mProfile.getFutureDates())); + apiVersion.setValue(API.valueOf(mProfile.getApiVersion())); url.setValue(mProfile.getUrl()); - useAuthentication.setValue(mProfile.isAuthEnabled()); - authUserName.setValue(mProfile.isAuthEnabled() ? mProfile.getAuthUserName() : ""); - authPassword.setValue(mProfile.isAuthEnabled() ? mProfile.getAuthPassword() : ""); + useAuthentication.setValue(mProfile.useAuthentication()); + authUserName.setValue(mProfile.useAuthentication() ? mProfile.getAuthUser() : ""); + authPassword.setValue(mProfile.useAuthentication() ? mProfile.getAuthPassword() : ""); preferredAccountsFilter.setValue(mProfile.getPreferredAccountsFilter()); - themeId.setValue(mProfile.getThemeHue()); + themeId.setValue(mProfile.getTheme()); + detectedVersion.setValue(mProfile.detectedVersionPre_1_19() ? new HledgerVersion(true) + : new HledgerVersion( + mProfile.getDetectedVersionMajor(), + mProfile.getDetectedVersionMinor())); } else { profileName.setValue(null); @@ -221,31 +256,118 @@ public class ProfileDetailModel extends ViewModel { postingPermitted.setValue(true); showCommentsByDefault.setValue(true); showCommodityByDefault.setValue(false); - setFutureDates(MobileLedgerProfile.FutureDates.None); - setApiVersion(SendTransactionTask.API.auto); + setFutureDates(FutureDates.None); + setApiVersion(API.auto); useAuthentication.setValue(false); authUserName.setValue(""); authPassword.setValue(""); preferredAccountsFilter.setValue(null); - themeId.setValue(newProfileHue); + detectedVersion.setValue(null); } - - } - void updateProfile(MobileLedgerProfile mProfile) { + void updateProfile(Profile mProfile) { mProfile.setName(profileName.getValue()); mProfile.setUrl(url.getValue()); - mProfile.setPostingPermitted(postingPermitted.getValue()); + mProfile.setPermitPosting(postingPermitted.getValue()); mProfile.setShowCommentsByDefault(showCommentsByDefault.getValue()); - Currency c = defaultCommodity.getValue(); - mProfile.setDefaultCommodity((c == null) ? null : c.getName()); + mProfile.setDefaultCommodity(defaultCommodity.getValue()); mProfile.setShowCommodityByDefault(showCommodityByDefault.getValue()); mProfile.setPreferredAccountsFilter(preferredAccountsFilter.getValue()); - mProfile.setAuthEnabled(useAuthentication.getValue()); - mProfile.setAuthUserName(authUserName.getValue()); + mProfile.setUseAuthentication(useAuthentication.getValue()); + mProfile.setAuthUser(authUserName.getValue()); mProfile.setAuthPassword(authPassword.getValue()); - mProfile.setThemeHue(themeId.getValue()); - mProfile.setFutureDates(futureDates.getValue()); - mProfile.setApiVersion(apiVersion.getValue()); + mProfile.setTheme(themeId.getValue()); + mProfile.setFutureDates(futureDates.getValue() + .toInt()); + mProfile.setApiVersion(apiVersion.getValue() + .toInt()); + HledgerVersion version = detectedVersion.getValue(); + mProfile.setDetectedVersionPre_1_19(version.isPre_1_20_1()); + mProfile.setDetectedVersionMajor(version.getMajor()); + mProfile.setDetectedVersionMinor(version.getMinor()); + } + synchronized public void triggerVersionDetection() { + if (versionDetectionThread != null) + versionDetectionThread.interrupt(); + + versionDetectionThread = new VersionDetectionThread(this); + versionDetectionThread.start(); + } + static class VersionDetectionThread extends Thread { + static final int TARGET_PROCESS_DURATION = 1000; + private final Pattern versionPattern = + Pattern.compile("^\"(\\d+)\\.(\\d+)(?:\\.(\\d+))?\"$"); + private final ProfileDetailModel model; + public VersionDetectionThread(ProfileDetailModel model) { + this.model = model; + } + private HledgerVersion detectVersion() { + App.setAuthenticationDataFromProfileModel(model); + HttpURLConnection http; + try { + http = NetworkUtil.prepareConnection(model.getUrl(), "version", + model.getUseAuthentication()); + switch (http.getResponseCode()) { + case 200: + break; + case 404: + return new HledgerVersion(true); + default: + Logger.debug("profile", String.format(Locale.US, + "HTTP error detecting hledger-web version: [%d] %s", + http.getResponseCode(), http.getResponseMessage())); + return null; + } + 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; + + return hasPatch ? new HledgerVersion(major, minor, patch) + : new HledgerVersion(major, minor); + } + else { + Logger.debug("profile", + String.format("Unrecognised version string '%s'", version)); + return null; + } + } + catch (IOException e) { + e.printStackTrace(); + return null; + } + finally { + App.resetAuthenticationData(); + } + } + @Override + public void run() { + model.detectingHledgerVersion.postValue(true); + try { + long startTime = System.currentTimeMillis(); + + final HledgerVersion version = detectVersion(); + + long elapsed = System.currentTimeMillis() - startTime; + Logger.debug("profile", "Detection duration " + elapsed); + if (elapsed < TARGET_PROCESS_DURATION) { + try { + Thread.sleep(TARGET_PROCESS_DURATION - elapsed); + } + catch (InterruptedException e) { + e.printStackTrace(); + } + } + model.detectedVersion.postValue(version); + } + finally { + model.detectingHledgerVersion.postValue(false); + } + } } }