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
8ab4ee96
Commit
8ab4ee96
authored
4 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
home: dismiss dialog on destroy
Change-Id: Ie49823f61d6dca7a4475699d413908d6313b9987
parent
a595ba89
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
ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
+9
-4
9 additions, 4 deletions
...ndroid/app/src/main/java/cx/ring/client/HomeActivity.java
with
9 additions
and
4 deletions
ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
+
9
−
4
View file @
8ab4ee96
...
...
@@ -31,6 +31,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import
androidx.annotation.NonNull
;
import
androidx.annotation.StringRes
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.core.content.ContextCompat
;
import
androidx.core.util.Pair
;
import
androidx.appcompat.app.ActionBar
;
...
...
@@ -152,7 +153,7 @@ public class HomeActivity extends AppCompatActivity implements BottomNavigationV
private
ActivityHomeBinding
binding
;
private
boolean
mIs
MigrationDialog
AlreadyShowed
;
private
AlertDialog
m
MigrationDialog
;
private
String
mAccountWithPendingrequests
=
null
;
private
final
CompositeDisposable
mDisposable
=
new
CompositeDisposable
();
...
...
@@ -237,6 +238,11 @@ public class HomeActivity extends AppCompatActivity implements BottomNavigationV
@Override
protected
void
onDestroy
()
{
super
.
onDestroy
();
if
(
mMigrationDialog
!=
null
)
{
if
(
mMigrationDialog
.
isShowing
())
mMigrationDialog
.
dismiss
();
mMigrationDialog
=
null
;
}
fContent
=
null
;
mDisposable
.
dispose
();
binding
=
null
;
...
...
@@ -280,11 +286,10 @@ public class HomeActivity extends AppCompatActivity implements BottomNavigationV
}
private
void
showMigrationDialog
()
{
if
(
m
Is
MigrationDialog
AlreadyShowed
)
{
if
(
mMigrationDialog
!=
null
)
{
return
;
}
mIsMigrationDialogAlreadyShowed
=
true
;
new
MaterialAlertDialogBuilder
(
this
)
mMigrationDialog
=
new
MaterialAlertDialogBuilder
(
this
)
.
setTitle
(
R
.
string
.
account_migration_title_dialog
)
.
setMessage
(
R
.
string
.
account_migration_message_dialog
)
.
setIcon
(
R
.
drawable
.
baseline_warning_24
)
...
...
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