From 722ebb22f618c27848b7d06a9d8588d264746406 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 15 Oct 2019 17:32:23 +0100 Subject: [PATCH] Use requestFocus tag to request initial focus. --- .../briar/android/account/AuthorNameFragment.java | 6 ------ .../briar/android/blog/RssFeedImportActivity.java | 6 ------ .../briar/android/blog/WriteBlogPostActivity.java | 1 - .../briar/android/forum/CreateForumActivity.java | 6 ------ .../briar/android/login/ChangePasswordActivity.java | 4 ---- .../briarproject/briar/android/login/PasswordFragment.java | 6 ------ .../android/privategroup/creation/CreateGroupFragment.java | 7 ------- .../briar/android/sharing/BaseMessageFragment.java | 6 ------ .../src/main/res/layout/activity_change_password.xml | 3 +++ .../src/main/res/layout/activity_create_forum.xml | 2 ++ .../src/main/res/layout/activity_write_blog_post.xml | 6 +++++- .../src/main/res/layout/fragment_create_group.xml | 2 ++ briar-android/src/main/res/layout/fragment_password.xml | 2 ++ .../src/main/res/layout/fragment_setup_author_name.xml | 1 + .../src/main/res/layout/fragment_setup_password.xml | 1 + 15 files changed, 16 insertions(+), 43 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java index 6e5885ed8..1643681d3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java @@ -65,12 +65,6 @@ public class AuthorNameFragment extends SetupFragment { return TAG; } - @Override - public void onResume() { - super.onResume(); - showSoftKeyboard(authorNameInput); - } - @Override protected String getHelpText() { return getString(R.string.setup_name_explanation); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java index 53d80ec76..9b8db53ef 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java @@ -89,12 +89,6 @@ public class RssFeedImportActivity extends BriarActivity { progressBar = findViewById(R.id.progressBar); } - @Override - public void onStart() { - super.onStart(); - if (urlInput.requestFocus()) showSoftKeyboard(urlInput); - } - @Override public boolean onCreateOptionsMenu(Menu menu) { return super.onCreateOptionsMenu(menu); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java index d79cee019..6e535d263 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java @@ -86,7 +86,6 @@ public class WriteBlogPostActivity extends BriarActivity public void onStart() { super.onStart(); notificationManager.blockNotification(groupId); - if (input.requestFocus()) showSoftKeyboard(input); } @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java index a7c3f5cd2..7d093a630 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java @@ -93,12 +93,6 @@ public class CreateForumActivity extends BriarActivity { progress = findViewById(R.id.createForumProgressBar); } - @Override - public void onStart() { - super.onStart(); - if (nameEntry.requestFocus()) showSoftKeyboard(nameEntry); - } - @Override public void injectActivity(ActivityComponent component) { component.inject(this); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java index 8faa07bad..0f0a91004 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java @@ -85,10 +85,6 @@ public class ChangePasswordActivity extends BriarActivity newPasswordConfirmation.addTextChangedListener(tw); newPasswordConfirmation.setOnEditorActionListener(this); changePasswordButton.setOnClickListener(this); - - if (state == null && currentPassword.requestFocus()) { - showSoftKeyboard(currentPassword); - } } @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java index f4e1a2766..d4f872d5b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java @@ -83,12 +83,6 @@ public class PasswordFragment extends BaseFragment implements TextWatcher { return v; } - @Override - public void onResume() { - super.onResume(); - showSoftKeyboard(password); - } - @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java index 4535c9f7f..373d6c3ea 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java @@ -25,7 +25,6 @@ import static android.view.View.VISIBLE; import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE; import static org.briarproject.briar.android.util.UiUtils.enterPressed; import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard; -import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard; import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_NAME_LENGTH; @MethodsNotNullByDefault @@ -93,12 +92,6 @@ public class CreateGroupFragment extends BaseFragment { return v; } - @Override - public void onStart() { - super.onStart(); - showSoftKeyboard(nameEntry); - } - @Override public String getUniqueTag() { return TAG; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java index eaff51eb4..cb5a4b299 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java @@ -64,12 +64,6 @@ public abstract class BaseMessageFragment extends BaseFragment @StringRes protected abstract int getHintText(); - @Override - public void onStart() { - super.onStart(); - message.showSoftKeyboard(); - } - @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { diff --git a/briar-android/src/main/res/layout/activity_change_password.xml b/briar-android/src/main/res/layout/activity_change_password.xml index 69a18171a..94cdff0fb 100644 --- a/briar-android/src/main/res/layout/activity_change_password.xml +++ b/briar-android/src/main/res/layout/activity_change_password.xml @@ -37,6 +37,9 @@ android:importantForAutofill="no" android:inputType="textPassword" android:maxLines="1"/> + + + + +