Skip to content
Snippets Groups Projects
Commit 2350db0c authored by Pierre Nicolas's avatar Pierre Nicolas :joy: Committed by Adrien Béraud
Browse files

linkdevice: connect import side

Todo: Move to accountId

Change-Id: Ibf9543ad9a4b7bd1dfb3e484eb6e0d680414221b
parent 7954106c
No related branches found
Tags android/release_319
No related merge requests found
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
package cx.ring.account package cx.ring.account
import android.app.Activity
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
...@@ -26,6 +27,7 @@ import androidx.activity.result.contract.ActivityResultContracts.StartActivityFo ...@@ -26,6 +27,7 @@ import androidx.activity.result.contract.ActivityResultContracts.StartActivityFo
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import cx.ring.R import cx.ring.R
import cx.ring.client.HomeActivity
import cx.ring.databinding.FragAccHomeCreateBinding import cx.ring.databinding.FragAccHomeCreateBinding
import cx.ring.fragments.SIPAccountCreationFragment import cx.ring.fragments.SIPAccountCreationFragment
import cx.ring.mvp.BaseSupportFragment import cx.ring.mvp.BaseSupportFragment
...@@ -38,6 +40,7 @@ import net.jami.account.HomeAccountCreationView ...@@ -38,6 +40,7 @@ import net.jami.account.HomeAccountCreationView
import net.jami.model.AccountCreationModel import net.jami.model.AccountCreationModel
import net.jami.utils.Log import net.jami.utils.Log
import java.io.File import java.io.File
import cx.ring.linkdevice.view.LinkDeviceImportSideActivity
@AndroidEntryPoint @AndroidEntryPoint
class HomeAccountCreationFragment : class HomeAccountCreationFragment :
...@@ -74,9 +77,19 @@ class HomeAccountCreationFragment : ...@@ -74,9 +77,19 @@ class HomeAccountCreationFragment :
} }
} }
private val linkDeviceActivityLauncher =
registerForActivityResult(StartActivityForResult()) { result ->
Log.i(JamiAccountSummaryFragment.TAG, "linkDeviceActivityLauncher: ${result.resultCode}")
if (result.resultCode == Activity.RESULT_OK) {
val accountId = result.data // Todo: How to use it ? Need to change currentAccount.
?.getStringExtra(LinkDeviceImportSideActivity.EXTRA_ACCOUNT_ID_KEY)
startActivity(Intent(requireContext(), HomeActivity::class.java))
}
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View = override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
FragAccHomeCreateBinding.inflate(inflater, container, false).apply { FragAccHomeCreateBinding.inflate(inflater, container, false).apply {
ringAddAccount.setOnClickListener { goToAccountLink() } linkDevice.setOnClickListener { goToAccountLink() }
ringCreateBtn.setOnClickListener { goToAccountCreation() } ringCreateBtn.setOnClickListener { goToAccountCreation() }
accountConnectServer.setOnClickListener { goToAccountConnect() } accountConnectServer.setOnClickListener { goToAccountConnect() }
ringImportAccount.setOnClickListener { performFileSearch() } ringImportAccount.setOnClickListener { performFileSearch() }
...@@ -98,7 +111,8 @@ class HomeAccountCreationFragment : ...@@ -98,7 +111,8 @@ class HomeAccountCreationFragment :
model.model = AccountCreationModel().apply { model.model = AccountCreationModel().apply {
isLink = true isLink = true
} }
replaceFragmentWithSlide(JamiLinkAccountFragment(), JamiLinkAccountFragment.TAG, R.id.wizard_container) linkDeviceActivityLauncher
.launch(Intent(requireContext(), LinkDeviceImportSideActivity::class.java))
} }
override fun goToAccountConnect() { override fun goToAccountConnect() {
......
...@@ -666,7 +666,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. ...@@ -666,7 +666,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
<string name="import_side_step2_password_prompt">The account is password-protected.\nUnlock it to continue.</string> <string name="import_side_step2_password_prompt">The account is password-protected.\nUnlock it to continue.</string>
<string name="import_side_step2_password_import">Import</string> <string name="import_side_step2_password_import">Import</string>
<string name="import_side_step2_password_unlocking">Unlocking your account…</string> <string name="import_side_step2_password_unlocking">Unlocking account…</string>
<string name="import_side_step2_action_required">Action required.\nPlease confirm account on the source device.</string> <string name="import_side_step2_action_required">Action required.\nPlease confirm account on the source device.</string>
<string name="import_side_step3_body_loading">The account is being imported on the new device.\nPlease wait.</string> <string name="import_side_step3_body_loading">The account is being imported on the new device.\nPlease wait.</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment