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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
05551ae4
Commit
05551ae4
authored
1 year ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
add support for new daemon API
Change-Id: Ic853ba225ccf62e835ac9b17b23acada4ad60459
parent
97c88099
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon
+1
-1
1 addition, 1 deletion
daemon
jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
+3
-3
3 additions, 3 deletions
...lient/src/main/kotlin/net/jami/services/AccountService.kt
with
4 additions
and
4 deletions
daemon
@
2b14e50f
Subproject commit
f83c60f27597558a05742e2b7af9d47ddff4f25d
Subproject commit
2b14e50fe6f83e7b327eb649b534b7e39892a027
This diff is collapsed.
Click to expand it.
jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
+
3
−
3
View file @
05551ae4
...
...
@@ -668,7 +668,7 @@ class AccountService(
.
firstOrError
()
.
map
{
r
:
DeviceRevocationResult
->
r
.
code
}
.
doOnSubscribe
{
mExecutor
.
execute
{
JamiService
.
revokeDevice
(
accountId
,
password
,
deviceI
d
)
JamiService
.
revokeDevice
(
accountId
,
deviceId
,
"
password
"
,
passwor
d
)
}}
.
subscribeOn
(
Schedulers
.
io
())
...
...
@@ -690,7 +690,7 @@ class AccountService(
fun
exportToFile
(
accountId
:
String
,
absolutePath
:
String
,
password
:
String
):
Completable
=
Completable
.
fromAction
{
require
(
JamiService
.
exportToFile
(
accountId
,
absolutePath
,
password
))
{
"Can't export archive"
}
require
(
JamiService
.
exportToFile
(
accountId
,
absolutePath
,
"password"
,
password
))
{
"Can't export archive"
}
}.
subscribeOn
(
scheduler
)
/**
...
...
@@ -838,7 +838,7 @@ class AccountService(
*/
fun
registerName
(
account
:
String
,
password
:
String
,
name
:
String
)
{
Log
.
i
(
TAG
,
"registerName()"
)
mExecutor
.
execute
{
JamiService
.
registerName
(
account
,
password
,
name
)
}
mExecutor
.
execute
{
JamiService
.
registerName
(
account
,
name
,
"
password
"
,
password
)
}
}
/* contact requests */
/**
...
...
This diff is collapsed.
Click to expand it.
Emma Falkiewitz
@efalkiewitz
mentioned in issue
#1524 (closed)
·
1 year ago
mentioned in issue
#1524 (closed)
mentioned in issue #1524
Toggle commit list
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