Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
2350db0c
Commit
2350db0c
authored
5 months ago
by
Pierre Nicolas
Committed by
Adrien Béraud
5 months ago
Browse files
Options
Downloads
Patches
Plain Diff
linkdevice: connect import side
Todo: Move to accountId Change-Id: Ibf9543ad9a4b7bd1dfb3e484eb6e0d680414221b
parent
7954106c
No related branches found
Tags
android/release_319
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
jami-android/app/src/main/java/cx/ring/account/HomeAccountCreationFragment.kt
+16
-2
16 additions, 2 deletions
.../main/java/cx/ring/account/HomeAccountCreationFragment.kt
jami-android/app/src/main/res/values/strings.xml
+1
-1
1 addition, 1 deletion
jami-android/app/src/main/res/values/strings.xml
with
17 additions
and
3 deletions
jami-android/app/src/main/java/cx/ring/account/HomeAccountCreationFragment.kt
+
16
−
2
View file @
2350db0c
...
@@ -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
{
r
in
gAddAccount
.
setOnClickListener
{
goToAccountLink
()
}
l
in
kDevice
.
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
()
{
...
...
This diff is collapsed.
Click to expand it.
jami-android/app/src/main/res/values/strings.xml
+
1
−
1
View file @
2350db0c
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment