QA_7325- secondry phone issue

app/res/navigation/nav_graph_connectid.xml

@@ -357,8 +357,7 @@
         tools:layout="@layout/screen_connect_user_deactivate_otp_verify">
         <action
             android:id="@+id/action_connectid_user_deactivate_otp_verify_to_connectid_message"
-            app:destination="@id/connectid_message"
-            app:popUpTo="@id/connectid_phone_verify" />
+            app:destination="@id/connectid_message" />
         <argument
             android:name="callingClass"
             app:argType="integer"

app/src/org/commcare/fragments/connectId/ConnectIdMessageFragment.java

@@ -119,7 +119,7 @@ public void finish(boolean success, boolean secondButton) {
                                 ConnectIdActivity.recoverPhone,
                                 ConnectIdActivity.recoverSecret,
                                 ConnectIdActivity.recoveryAltPhone,
-                                true
+                                false
                         ).setAllowChange(false);
                     }
                 }
@@ -201,10 +201,10 @@ public void finish(boolean success, boolean secondButton) {
                         directions = ConnectIdMessageFragmentDirections.actionConnectidMessageToConnectidUserDeactivateOtpVerify(
                                 ConnectConstants.CONNECT_VERIFY_USER_DEACTIVATE,
                                 String.format(Locale.getDefault(), "%d", ConnectIdPhoneVerificationFragmnet.MethodUserDeactivate),
-                                null,
+                                ConnectIdActivity.recoverPhone,
                                 userName,
                                 password,
-                                null,false).setAllowChange(false);
+                                null,true).setAllowChange(false);
                     } else {
                         NavHostFragment.findNavController(this).popBackStack();
                     }

app/src/org/commcare/fragments/connectId/ConnectIdUserDeactivateOTPVerificationFragment.java

@@ -339,7 +339,7 @@ public void processSuccess(int responseCode, InputStream responseData) {
                 try {
                     stopHandler();
                     Navigation.findNavController(binding.connectPhoneVerifyButton).navigate(
-                            ConnectIdPhoneVerificationFragmnetDirections.actionConnectidPhoneVerifyToConnectidMessage(
+                            ConnectIdUserDeactivateOTPVerificationFragmentDirections.actionConnectidUserDeactivateOtpVerifyToConnectidMessage(
                                     getString(R.string.connect_deactivate_account),
                                     getString(R.string.connect_deactivate_account_deactivated),
                                     ConnectConstants.CONNECT_USER_DEACTIVATE_SUCCESS,

app/src/org/commcare/logging/AndroidLogger.java

@@ -2,11 +2,13 @@
 
 import org.commcare.android.javarosa.AndroidLogEntry;
 import org.commcare.models.database.SqlStorage;
+import org.commcare.util.LogTypes;
 import org.commcare.utils.CrashUtil;
 import org.javarosa.core.api.ILogger;
 import org.javarosa.core.log.IFullLogSerializer;
 import org.javarosa.core.log.LogEntry;
 import org.javarosa.core.log.StreamLogSerializer;
+import org.javarosa.core.services.Logger;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -82,4 +84,9 @@ public int logSize() {
     public void halt() {
         //Meh.
     }
+
+    @Override
+    public void logException(Throwable e) {
+        Logger.exception(LogTypes.TYPE_USER, e);
+    }
 }

app/src/org/commcare/logging/PreInitLogger.java

@@ -1,6 +1,7 @@
 package org.commcare.logging;
 
 import org.commcare.android.javarosa.AndroidLogEntry;
+import org.commcare.util.LogTypes;
 import org.javarosa.core.api.ILogger;
 import org.javarosa.core.log.IFullLogSerializer;
 import org.javarosa.core.log.StreamLogSerializer;
@@ -72,4 +73,9 @@ public int logSize() {
     public void halt() {
         // TODO Auto-generated method stub
     }
+
+    @Override
+    public void logException(Throwable e) {
+        Logger.exception(LogTypes.TYPE_USER, e);
+    }
 }