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
95e8c068
Commit
95e8c068
authored
9 months ago
by
Vitalii Nikitchyn
Committed by
Vitalii Nikitchyn
9 months ago
Browse files
Options
Downloads
Patches
Plain Diff
HomeActivity settings backPress bugfix
GitLab:
#1629
Change-Id: Ia753b8da5d50685b689fc63693be68b64cec158a
parent
ad41c226
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
jami-android/app/src/main/java/cx/ring/client/HomeActivity.kt
+12
-8
12 additions, 8 deletions
...-android/app/src/main/java/cx/ring/client/HomeActivity.kt
with
12 additions
and
8 deletions
jami-android/app/src/main/java/cx/ring/client/HomeActivity.kt
+
12
−
8
View file @
95e8c068
...
...
@@ -108,16 +108,20 @@ class HomeActivity : AppCompatActivity(), ContactPickerFragment.OnContactedPicke
private
val
conversationBackPressedCallback
:
OnBackPressedCallback
=
object
:
OnBackPressedCallback
(
false
)
{
override
fun
handleOnBackPressed
()
{
removeFragment
(
fConversation
)
fConversation
=
null
if
(
supportFragmentManager
.
backStackEntryCount
==
0
)
{
removeFragment
(
fConversation
)
fConversation
=
null
// Hiding the conversation
if
(
mBinding
?.
panel
?.
isSlideable
==
true
)
{
// No space to keep the pane open
mBinding
?.
panel
?.
closePane
()
}
else
showWelcomeFragment
()
// Hiding the conversation
if
(
mBinding
?.
panel
?.
isSlideable
==
true
)
{
// No space to keep the pane open
mBinding
?.
panel
?.
closePane
()
}
else
showWelcomeFragment
()
// Next back press doesn't have to be handled by this callback.
isEnabled
=
false
// Next back press doesn't have to be handled by this callback.
isEnabled
=
false
}
else
{
supportFragmentManager
.
popBackStack
()
}
}
}
...
...
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