Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
Show loader while registering and verifying Signal
Arka Prava Basu1d826da17955
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.javaindex a9b46cc..b53a745 100644--- a/src/main/java/org/havenapp/main/SettingsFragment.java+++ b/src/main/java/org/havenapp/main/SettingsFragment.java@@ -7,6 +7,7 @@ package org.havenapp.main;import android.Manifest;import android.annotation.SuppressLint;import android.app.Activity;+import android.app.ProgressDialog;import android.content.Context;import android.content.Intent;import android.content.SharedPreferences;@@ -242,6 +243,9 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Sharedif (TextUtils.isEmpty(signalUsername)) {findPreference(PreferenceManager.REGISTER_SIGNAL).performClick();} else {+ if (getActivity() != null) {+ Utils.hideKeyboard(getActivity());+ }activateSignal(signalUsername, null);}}@@ -397,6 +401,9 @@ public class SettingsFragment extends PreferenceFragmentCompat implements SharedfindPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(signalNum);resetSignal(preferences.getSignalUsername());+ if (getActivity() != null) {+ Utils.hideKeyboard(getActivity());+ }activateSignal(preferences.getSignalUsername(), null);} else if (!getCountryCode().equalsIgnoreCase(signalNum)) {preferences.setSignalUsername("");@@ -406,6 +413,9 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Sharedbreak;case PreferenceManager.VERIFY_SIGNAL: {String text = ((EditTextPreference) findPreference(PreferenceManager.VERIFY_SIGNAL)).getText();+ if (getActivity() != null) {+ Utils.hideKeyboard(getActivity());+ }activateSignal(preferences.getSignalUsername(), text);onRemoteNotificationParameterChange();break;@@ -413,6 +423,9 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Sharedcase PreferenceManager.REMOTE_PHONE_NUMBER:setPhoneNumber();onRemoteNotificationParameterChange();+ if (getActivity() != null) {+ Utils.hideKeyboard(getActivity());+ }break;case PreferenceManager.NOTIFICATION_TIME:try@@ -576,27 +589,43 @@ public class SettingsFragment extends PreferenceFragmentCompat implements SharedSignalSender sender = SignalSender.getInstance(mActivity, username);if (TextUtils.isEmpty(verifyCode)) {+ ProgressDialog progressDialog = ProgressDialog.show(getContext(), "Registering to Signal",+ "Please wait while we register you to Signal services");sender.register(preferences.getVoiceVerificationEnabled(),new SignalExecutorTask.TaskResult() {@Overridepublic void onSuccess(@NonNull String msg) {+ if (isAdded() && getActivity() != null) {+ progressDialog.dismiss();+ }Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT).show();}@Overridepublic void onFailure(@NonNull String msg) {+ if (isAdded() && getActivity() != null) {+ progressDialog.dismiss();+ }Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT).show();}});} else {+ ProgressDialog progressDialog = ProgressDialog.show(getContext(), "Verifying",+ "Please wait while we verify your registration to Signal services");sender.verify(verifyCode, new SignalExecutorTask.TaskResult() {@Overridepublic void onSuccess(@NonNull String msg) {+ if (isAdded() && getActivity() != null) {+ progressDialog.dismiss();+ }Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT).show();}@Overridepublic void onFailure(@NonNull String msg) {+ if (isAdded() && getActivity() != null) {+ progressDialog.dismiss();+ }Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT).show();}});diff --git a/src/main/java/org/havenapp/main/Utils.java b/src/main/java/org/havenapp/main/Utils.javaindex 6b9b07e..130b0b5 100644--- a/src/main/java/org/havenapp/main/Utils.java+++ b/src/main/java/org/havenapp/main/Utils.java@@ -1,15 +1,19 @@package org.havenapp.main;+import android.app.Activity;import android.content.Context;import android.content.Intent;import android.content.IntentFilter;import android.os.BatteryManager;+import android.view.inputmethod.InputMethodManager;import java.text.SimpleDateFormat;import java.util.Date;import java.util.Locale;import java.util.concurrent.TimeUnit;+import androidx.annotation.NonNull;+/*** Created by Anupam Das (opticod) on 28/12/17.* <p>@@ -70,4 +74,13 @@ public class Utils {return (int) (batteryPct * 100);}++ public static void hideKeyboard(@NonNull Activity activity) {+ if (activity.getCurrentFocus() != null) {+ InputMethodManager inputMethodManager =+ (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);+ inputMethodManager.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(),+ 0);+ }+ }}