X-Git-Url: https://git.ktnx.net/?p=mobile-ledger-staging.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=10f43667992fb27bfb17e5e74fe404230de26b92;hp=672acf0ec4a58cb37d7ba0a897c8065b9433feae;hb=a87079ed41bdc3ad89fe8bd15dfba10e37b29b76;hpb=052c43e2d1b50e31aa9b1293e929de6dd8ffbc6b diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java index 672acf0e..10f43667 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java @@ -287,19 +287,23 @@ public class ProfileDetailFragment extends Fragment { context.findViewById(R.id.api_version_text) .setOnClickListener(this::chooseAPIVersion); - TextView detectedApiVersion = context.findViewById(R.id.detected_version_text); + context.findViewById(R.id.server_version_label) + .setOnClickListener(v -> model.triggerVersionDetection()); + TextView detectedServerVersion = context.findViewById(R.id.detected_server_version_text); model.observeDetectedVersion(viewLifecycleOwner, ver -> { if (ver == null) - detectedApiVersion.setText(context.getResources() - .getString(R.string.api_version_unknown_label)); - else if (ver.isPre_1_20()) - detectedApiVersion.setText(context.getResources() - .getString(R.string.api_pre_1_19)); + detectedServerVersion.setText(context.getResources() + .getString( + R.string.server_version_unknown_label)); + else if (ver.isPre_1_20_1()) + detectedServerVersion.setText(context.getResources() + .getString( + R.string.detected_server_pre_1_20_1)); else - detectedApiVersion.setText(ver.toString()); + detectedServerVersion.setText(ver.toString()); }); - detectedApiVersion.setOnClickListener(v -> model.triggerVersionDetection()); - final View detectButton = context.findViewById(R.id.api_version_detect_button); + detectedServerVersion.setOnClickListener(v -> model.triggerVersionDetection()); + final View detectButton = context.findViewById(R.id.server_version_detect_button); detectButton.setOnClickListener(v -> model.triggerVersionDetection()); model.observeDetectingHledgerVersion(viewLifecycleOwner, running -> { detectButton.setVisibility(running ? View.VISIBLE : View.INVISIBLE); @@ -394,11 +398,14 @@ public class ProfileDetailFragment extends Fragment { case R.id.api_version_menu_html: apiVer = SendTransactionTask.API.html; break; - case R.id.api_version_menu_post_1_14: - apiVer = SendTransactionTask.API.post_1_14; + case R.id.api_version_menu_1_19_1: + apiVer = SendTransactionTask.API.v1_19_1; break; - case R.id.api_version_menu_pre_1_15: - apiVer = SendTransactionTask.API.pre_1_15; + case R.id.api_version_menu_1_15: + apiVer = SendTransactionTask.API.v1_15; + break; + case R.id.api_version_menu_1_14: + apiVer = SendTransactionTask.API.v1_14; break; case R.id.api_version_menu_auto: default: