From e2b3340734e83cdeb110bbd477525bc77eb4e64c Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 15 Oct 2019 17:19:15 +0100 Subject: [PATCH] Remove redundant methods for showing/hiding keyboard. --- .../briar/android/activity/BaseActivity.java | 9 +-------- .../briar/android/blog/RssFeedImportActivity.java | 1 + .../briar/android/forum/CreateForumActivity.java | 2 ++ .../introduction/IntroductionMessageFragment.java | 5 +++-- .../briar/android/login/ChangePasswordActivity.java | 2 ++ .../privategroup/creation/CreateGroupFragment.java | 6 ++++-- .../privategroup/creation/CreateGroupListener.java | 7 ------- 7 files changed, 13 insertions(+), 19 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java index c7b5761f2..b56385c86 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java @@ -45,6 +45,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static java.util.logging.Level.INFO; import static java.util.logging.Logger.getLogger; import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS; +import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard; /** * Warning: Some activities don't extend {@link BaseActivity}. @@ -214,14 +215,6 @@ public abstract class BaseActivity extends AppCompatActivity }); } - public void showSoftKeyboard(View view) { - UiUtils.showSoftKeyboard(view); - } - - public void hideSoftKeyboard(View view) { - UiUtils.hideSoftKeyboard(view); - } - @UiThread public void handleDbException(DbException e) { supportFinishAfterTransition(); 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 0a0558dfb..664ca2b51 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 @@ -32,6 +32,7 @@ import static android.view.View.VISIBLE; import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard; public class RssFeedImportActivity extends BriarActivity { 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 5279b6449..a7c3f5cd2 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 @@ -34,6 +34,8 @@ import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.now; 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.forum.ForumConstants.MAX_FORUM_NAME_LENGTH; @MethodsNotNullByDefault diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java index 70478b884..fd9b77592 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java @@ -43,6 +43,7 @@ import static java.util.Objects.requireNonNull; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; +import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard; import static org.briarproject.briar.api.introduction.IntroductionConstants.MAX_INTRODUCTION_TEXT_LENGTH; @MethodsNotNullByDefault @@ -184,7 +185,7 @@ public class IntroductionMessageFragment extends BaseFragment public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: - introductionActivity.hideSoftKeyboard(ui.message); + hideSoftKeyboard(ui.message); introductionActivity.onBackPressed(); return true; default: @@ -201,7 +202,7 @@ public class IntroductionMessageFragment extends BaseFragment makeIntroduction(contact1, contact2, text); // don't wait for the introduction to be made before finishing activity - introductionActivity.hideSoftKeyboard(ui.message); + hideSoftKeyboard(ui.message); introductionActivity.setResult(RESULT_OK); introductionActivity.supportFinishAfterTransition(); } 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 af53df32b..8faa07bad 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 @@ -26,6 +26,8 @@ import javax.inject.Inject; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_WEAK; +import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard; +import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard; public class ChangePasswordActivity extends BriarActivity implements OnClickListener, OnEditorActionListener { 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 24caee716..4535c9f7f 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 @@ -24,6 +24,8 @@ import static android.view.View.GONE; 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 @@ -94,7 +96,7 @@ public class CreateGroupFragment extends BaseFragment { @Override public void onStart() { super.onStart(); - if (nameEntry.requestFocus()) listener.showSoftKeyboard(nameEntry); + showSoftKeyboard(nameEntry); } @Override @@ -120,7 +122,7 @@ public class CreateGroupFragment extends BaseFragment { private void createGroup() { if (!validateName()) return; - listener.hideSoftKeyboard(nameEntry); + hideSoftKeyboard(nameEntry); createGroupButton.setVisibility(GONE); progress.setVisibility(VISIBLE); listener.onGroupNameChosen(nameEntry.getText().toString()); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupListener.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupListener.java index 7485acfe8..c02ede101 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupListener.java @@ -1,15 +1,8 @@ package org.briarproject.briar.android.privategroup.creation; -import android.view.View; - import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; interface CreateGroupListener extends BaseFragmentListener { void onGroupNameChosen(String name); - - void showSoftKeyboard(View view); - - void hideSoftKeyboard(View view); - }