Merge branch 'lukeswitz-voice-verification'

Author: n8fr8

build.gradle

@@ -121,7 +121,7 @@ dependencies {
     implementation 'com.takisoft.fix:preference-v7:27.1.0.0'
     implementation 'com.wdullaer:materialdatetimepicker:3.5.2'
 
-    compile 'com.googlecode.libphonenumber:libphonenumber:8.7.0'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.7.0'
     implementation('com.mikepenz:aboutlibraries:6.0.2@aar') {
         transitive = true
     }

src/main/java/org/havenapp/main/PreferenceManager.java

@@ -61,6 +61,7 @@ public class PreferenceManager {
     public static final String SMS_NUMBER = "sms_number";
     public static final String REGISTER_SIGNAL = "register_signal";
     public static final String VERIFY_SIGNAL = "verify_signal";
+    public static final String VOICE_VERIFY_SIGNAL = "voice_verify_signal";
     public static final String SEND_SMS = "send_sms";
     private static final String UNLOCK_CODE="unlock_code";
 
@@ -273,6 +274,15 @@ public void setMonitoringTime (int delay)
         prefsEditor.commit();
     }
 
+    public void setVoiceVerification(boolean active) {
+        prefsEditor.putBoolean(VOICE_VERIFY_SIGNAL, active);
+        prefsEditor.commit();
+    }
+
+    public boolean getVoiceVerificationEnabled() {
+        return appSharedPrefs.getBoolean(VOICE_VERIFY_SIGNAL, false);
+    }
+
     public String getDirPath() {
     	return DIR_PATH;
     }

src/main/java/org/havenapp/main/SettingsActivity.java

@@ -22,6 +22,7 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
+import android.view.View;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -62,4 +63,8 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     public void onBackPressed() {
        mFragment.save();
     }
+
+    public void switchClickListener(View view) {
+        mFragment.checkCallToVerify(view);
+    }
 }

src/main/java/org/havenapp/main/SettingsFragment.java

@@ -26,6 +26,8 @@
 import android.support.v7.preference.SwitchPreferenceCompat;
 import android.text.TextUtils;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.Switch;
 import android.widget.Toast;
 
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
@@ -218,6 +220,8 @@ protected void save() {
 
         preferences.setActivateVideoMonitoring(videoMonitoringActive);
 
+        preferences.setSignalUsername(((EditTextPreference) findPreference(PreferenceManager.REGISTER_SIGNAL)).getText());
+
         boolean remoteAccessActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
 
         preferences.activateRemoteAccess(remoteAccessActive);
@@ -229,6 +233,8 @@ protected void save() {
             app.startServer();
         }
 
+        preferences.setVoiceVerification(false);
+
         boolean heartbeatMonitorActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
 
         preferences.activateHeartbeat(heartbeatMonitorActive);
@@ -494,7 +500,7 @@ private void activateSignal(String username, String verifyCode) {
         SignalSender sender = SignalSender.getInstance(mActivity, username);
 
         if (TextUtils.isEmpty(verifyCode)) {
-            sender.register();
+            sender.register(preferences.getVoiceVerificationEnabled());
         } else {
             sender.verify(verifyCode);
         }
@@ -561,4 +567,13 @@ private void requestChangeBatteryOptimizations ()
             getActivity().startActivity(intent);
         }
     }
+
+    public void checkCallToVerify (View v) {
+        Switch callSwitch = v.findViewById(R.id.signalCallSwitch);
+        if (callSwitch != null && callSwitch.isChecked()) {
+            preferences.setVoiceVerification(true);
+        } else {
+            preferences.setVoiceVerification(false);
+        }
+    }
 }

src/main/java/org/havenapp/main/service/SignalSender.java

@@ -54,7 +54,7 @@ public void reset ()
         mInstance = null;
     }
 
-    public void register ()
+    public void register (boolean callEnabled)
     {
         execute (new Runnable() {
             public void run() {
@@ -63,7 +63,10 @@ public void run() {
 
                 map.put("username", mUsername);
                 map.put("command", "register");
-                map.put("voice", false);
+                if (!callEnabled)
+                    map.put("voice", false);
+                else
+                    map.put("voice", true);
 
                 Namespace ns = new Namespace(map);
                 mainSignal.handleCommands(ns);

src/main/res/layout/pref_dialog_edit_text_hint_signal.xml

@@ -0,0 +1,42 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginBottom="@dimen/activity_vertical_large_margin"
+    android:layout_marginTop="@dimen/activity_vertical_large_margin"
+    android:overScrollMode="ifContentScrolls">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/alert_def_padding"
+        android:paddingEnd="?dialogPreferredPadding"
+        android:paddingLeft="?dialogPreferredPadding"
+        android:paddingRight="?dialogPreferredPadding"
+        android:paddingStart="?dialogPreferredPadding"
+        android:paddingTop="@dimen/alert_def_padding">
+
+        <TextView
+            android:id="@android:id/message"
+            style="?android:attr/textAppearanceSmall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/alert_def_padding"
+            android:textColor="?android:attr/textColorSecondary" />
+
+        <Switch
+            android:id="@+id/signalCallSwitch"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:onClick="switchClickListener"
+            android:text="@string/verify_signal_by_phone" />
+
+        <EditText
+            android:id="@android:id/edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/hint_number" />
+
+    </LinearLayout>
+</ScrollView>

src/main/res/values/strings.xml

@@ -95,6 +95,7 @@
     <string name="register">Register</string>
     <string name="activate_signal">Activate Signal</string>
     <string name="verify_signal">Verify Signal</string>
+    <string name="verify_signal_by_phone">Call me instead</string>
     <string name="enter_verification">Enter the verification code you received from the Signal registration step</string>
     <string name="cancel">Cancel</string>
     <string name="register_title">Register with Signal</string>

src/main/res/xml/settings.xml

@@ -63,7 +63,7 @@
 
         <EditTextPreference
             style="@style/AppPreference.DialogPreferenceRegister"
-            android:dialogLayout="@layout/pref_dialog_edit_text_hint"
+            android:dialogLayout="@layout/pref_dialog_edit_text_hint_signal"
             android:dialogMessage="@string/register_signal_desc"
             android:inputType="phone"
             android:key="register_signal"