Skip to content

Fix crash on dismissing SimpleProgressDialog after pressing Home #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2025
Merged

Fix crash on dismissing SimpleProgressDialog after pressing Home #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
708f52f
Update SDK and dependencies
eltos Sep 30, 2025
984deb2
Fix #97
eltos Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.4'
classpath 'com.android.tools.build:gradle:8.13.0'

// Required plugins added to classpath to facilitate pushing to maven
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Nov 04 11:57:33 CET 2023
#Tue Sep 30 18:40:20 CEST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions lintchecks/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ apply plugin: 'com.android.lint'

dependencies {
// If the Gradle plugin version is X.Y.Z, then the Lint library version is X+23.Y.Z
compileOnly 'com.android.tools.lint:lint-api:31.9.1'
compileOnly 'com.android.tools.lint:lint-checks:31.9.1'
compileOnly 'com.android.tools.lint:lint-api:31.13.0'
compileOnly 'com.android.tools.lint:lint-checks:31.13.0'
}

jar {
Expand Down
6 changes: 3 additions & 3 deletions simpledialogfragments/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ apply plugin: 'com.android.library'
android {
namespace 'eltos.simpledialogfragment'

compileSdk 34

defaultConfig {
compileSdkVersion 36
minSdkVersion 21
targetSdkVersion 34
}
Expand Down Expand Up @@ -34,8 +34,8 @@ dependencies {
lintPublish project(':lintchecks')

testImplementation 'junit:junit:4.13.2'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'com.google.android.material:material:1.13.0'
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
implementation 'com.alimuzaffar.lib:pinentryedittext:2.0.6'
}
Expand Down
13 changes: 11 additions & 2 deletions simpledialogfragments/src/main/java/eltos/simpledialogfragment/SimpleProgressDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package eltos.simpledialogfragment;

import android.os.AsyncTask;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
Expand Down Expand Up @@ -282,13 +283,21 @@ public void updateFinished(){
setPositiveButtonEnabled(true);
setNeutralButtonEnabled(false);
if (getArgs().getBoolean(AUTO_DISMISS)){
dismiss();
dismissAllowingStateLoss(); // ok to fail if stopped, will dismiss in onResume
callResultListener(COMPLETED, new Bundle());
}
}
}


@Override
public void onResume() {
super.onResume();
if (getArgs().getBoolean(AUTO_DISMISS)) {
if (mTask != null && mTask.getStatus() == AsyncTask.Status.FINISHED) {
dismiss();
}
}
}

/**
* Set or update the progress text at the start of the progress bar /
Expand Down
8 changes: 4 additions & 4 deletions testApp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ plugins {
android {
namespace 'eltos.simpledialogfragments'

compileSdk 34

defaultConfig {
applicationId 'eltos.simpledialogfragments.test'
compileSdkVersion 36
minSdkVersion 21
targetSdkVersion 34
versionCode rootProject.ext['VERSION_NR']
Expand All @@ -30,10 +30,10 @@ repositories {

dependencies {
testImplementation 'junit:junit:4.13.2'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'com.google.android.material:material:1.13.0'
implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation 'com.google.zxing:core:3.5.2'
implementation 'com.google.zxing:core:3.5.3'

// sonatype maven
//implementation 'io.github.eltos:simpledialogfragments:3.5.1'
Expand Down
Loading