Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
xx Messenger Android
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
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
mobile
android
xx Messenger Android
Commits
af84bbbd
Commit
af84bbbd
authored
Aug 1, 2022
by
Kamal Bramwell
Browse files
Options
Downloads
Patches
Plain Diff
Updated copy for request/invitation received notices
parent
671a1841
No related branches found
No related tags found
3 merge requests
!84
Version 2.92 build 629
,
!77
v2.9 b627
,
!71
Updated copy for request/invitation received notices
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/src/main/java/io/xxlabs/messenger/ui/main/MainActivity.kt
+4
-4
4 additions, 4 deletions
...src/main/java/io/xxlabs/messenger/ui/main/MainActivity.kt
with
4 additions
and
4 deletions
app/src/main/java/io/xxlabs/messenger/ui/main/MainActivity.kt
+
4
−
4
View file @
af84bbbd
...
@@ -501,7 +501,7 @@ class MainActivity : MediaProviderActivity(), SnackBarActivity, CustomToastActiv
...
@@ -501,7 +501,7 @@ class MainActivity : MediaProviderActivity(), SnackBarActivity, CustomToastActiv
Timber
.
v
(
"New request sent - UI - $result"
)
Timber
.
v
(
"New request sent - UI - $result"
)
when
(
result
)
{
when
(
result
)
{
is
SimpleRequestState
.
Success
->
{
is
SimpleRequestState
.
Success
->
{
createSnackMessage
(
"One of your con
tact
requests was successfully sent!"
)
createSnackMessage
(
"One of your con
nection
requests was successfully sent!"
)
contactsViewModel
.
newAuthRequestSent
.
postValue
(
SimpleRequestState
.
Completed
())
contactsViewModel
.
newAuthRequestSent
.
postValue
(
SimpleRequestState
.
Completed
())
}
}
is
SimpleRequestState
.
Error
->
{
is
SimpleRequestState
.
Error
->
{
...
@@ -531,7 +531,7 @@ class MainActivity : MediaProviderActivity(), SnackBarActivity, CustomToastActiv
...
@@ -531,7 +531,7 @@ class MainActivity : MediaProviderActivity(), SnackBarActivity, CustomToastActiv
contactsViewModel
.
newIncomingRequestReceived
.
observe
(
this
,
Observer
{
result
->
contactsViewModel
.
newIncomingRequestReceived
.
observe
(
this
,
Observer
{
result
->
Timber
.
v
(
"New incoming request - UI - $result"
)
Timber
.
v
(
"New incoming request - UI - $result"
)
if
(
result
is
SimpleRequestState
.
Success
)
{
if
(
result
is
SimpleRequestState
.
Success
)
{
createSnackMessage
(
"
Private channel invitation
received!"
)
createSnackMessage
(
"
New connection request
received!"
)
contactsViewModel
.
newIncomingRequestReceived
.
postValue
(
SimpleRequestState
.
Completed
())
contactsViewModel
.
newIncomingRequestReceived
.
postValue
(
SimpleRequestState
.
Completed
())
}
else
{
}
else
{
Timber
.
v
(
"Completed new incoming contact"
)
Timber
.
v
(
"Completed new incoming contact"
)
...
@@ -542,7 +542,7 @@ class MainActivity : MediaProviderActivity(), SnackBarActivity, CustomToastActiv
...
@@ -542,7 +542,7 @@ class MainActivity : MediaProviderActivity(), SnackBarActivity, CustomToastActiv
Timber
.
v
(
"New confirmation request - UI - $result"
)
Timber
.
v
(
"New confirmation request - UI - $result"
)
if
(
result
is
SimpleRequestState
.
Success
)
{
if
(
result
is
SimpleRequestState
.
Success
)
{
Timber
.
v
(
"Request is success"
)
Timber
.
v
(
"Request is success"
)
createSnackMessage
(
"A con
tact
has accepted your
private channel
request!"
)
createSnackMessage
(
"A con
nection
has accepted your request!"
)
contactsViewModel
.
newConfirmationRequestReceived
.
postValue
(
SimpleRequestState
.
Completed
())
contactsViewModel
.
newConfirmationRequestReceived
.
postValue
(
SimpleRequestState
.
Completed
())
}
else
{
}
else
{
Timber
.
v
(
"Completed confirm contact post"
)
Timber
.
v
(
"Completed confirm contact post"
)
...
@@ -565,7 +565,7 @@ class MainActivity : MediaProviderActivity(), SnackBarActivity, CustomToastActiv
...
@@ -565,7 +565,7 @@ class MainActivity : MediaProviderActivity(), SnackBarActivity, CustomToastActiv
Timber
.
v
(
"New Group Request - UI - $result"
)
Timber
.
v
(
"New Group Request - UI - $result"
)
if
(
result
is
SimpleRequestState
.
Success
)
{
if
(
result
is
SimpleRequestState
.
Success
)
{
Timber
.
v
(
"Request is success"
)
Timber
.
v
(
"Request is success"
)
createSnackMessage
(
"
Private G
roup invitation received!"
)
createSnackMessage
(
"
New g
roup invitation received!"
)
mainViewModel
.
newGroup
.
postValue
(
SimpleRequestState
.
Completed
())
mainViewModel
.
newGroup
.
postValue
(
SimpleRequestState
.
Completed
())
}
else
{
}
else
{
Timber
.
v
(
"Completed confirm contact post"
)
Timber
.
v
(
"Completed confirm contact post"
)
...
...
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