From 6f2e5a63d70945410832cb7e40bad73b9620f878 Mon Sep 17 00:00:00 2001 From: Grishka Date: Mon, 19 Dec 2022 20:27:56 +0300 Subject: [PATCH 1/3] =?UTF-8?q?This=20is=20officially=20the=20first=20Xiao?= =?UTF-8?q?mi=20workaround=20in=20this=20app=20=F0=9F=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #469 --- .../android/fragments/ProfileFragment.java | 2 +- .../org/joinmastodon/android/ui/utils/UiUtils.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index 53ee3d297..50be8f64c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -281,7 +281,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList username+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain; } getActivity().getSystemService(ClipboardManager.class).setPrimaryClip(ClipData.newPlainText(null, "@"+username)); - if(Build.VERSION.SDK_INT props=Class.forName("android.os.SystemProperties"); + Method get=props.getMethod("get", String.class); + return (String)get.invoke(null, key); + }catch(Exception ignore){} + return null; + } + + public static boolean isMIUI(){ + return !TextUtils.isEmpty(getSystemProperty("ro.miui.ui.version.code")); + } } From d9df150cf84dc7eb2be05c01606f1b61785a05f6 Mon Sep 17 00:00:00 2001 From: Grishka Date: Tue, 20 Dec 2022 12:14:56 +0300 Subject: [PATCH 2/3] Fix #472 --- .../android/fragments/onboarding/SignupFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java index 987cc0b8e..ad0babf55 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java @@ -155,7 +155,7 @@ public class SignupFragment extends ToolbarFragment{ } private void onButtonClick(){ - if(!password.getText().equals(passwordConfirm.getText())){ + if(!password.getText().toString().equals(passwordConfirm.getText().toString())){ passwordConfirm.setError(getString(R.string.signup_passwords_dont_match)); passwordConfirmWrap.setErrorState(); return; From 68e9d9d91c3bfcab0c6bb15a79f046e4d275a233 Mon Sep 17 00:00:00 2001 From: sk Date: Wed, 21 Dec 2022 09:24:09 +0100 Subject: [PATCH 3/3] only load default visibility if not editing fix mastodon#306 --- .../org/joinmastodon/android/fragments/ComposeFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 406d74673..232c20487 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -211,7 +211,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr else charLimit=500; - loadDefaultStatusVisibility(savedInstanceState); + if (editingStatus == null) loadDefaultStatusVisibility(savedInstanceState); } @Override