Skip to content

Commit cc39db5

Browse files
committed
Release 1.0.6
1 parent 125fa98 commit cc39db5

File tree

6 files changed

+23
-17
lines changed

6 files changed

+23
-17
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This library is enhanced for using AsyncTask api.
1313
Gradle
1414
```groovy
1515
dependencies {
16-
compile 'net.sjava:advancedasynctask:1.0.5'
16+
compile 'net.sjava:advancedasynctask:1.0.6'
1717
}
1818
```
1919

@@ -22,7 +22,7 @@ Maven
2222
<dependency>
2323
<groupId>net.sjava</groupId>
2424
<artifactId>advancedasynctask</artifactId>
25-
<version>1.0.5</version>
25+
<version>1.0.6</version>
2626
</dependency>
2727
```
2828

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.0'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

demo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion "24.0.3"
5+
buildToolsVersion '25.0.0'
66

77
defaultConfig {
88
applicationId 'net.sjava.advancedasynctask.demo'

library/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ publish {
55
userOrg = 'mcsong'
66
groupId = 'net.sjava'
77
artifactId = 'advancedasynctask'
8-
publishVersion = '1.0.5'
8+
publishVersion = '1.0.6'
99
desc = 'Advanced Asynctask library for Android'
1010
website = 'https://github.com/mcsong/AdvancedAsyncTask'
1111
issueTracker = "${website}/issues"
@@ -22,8 +22,8 @@ buildscript {
2222
}
2323

2424
android {
25-
compileSdkVersion 24
26-
buildToolsVersion "24.0.3"
25+
compileSdkVersion 25
26+
buildToolsVersion "25.0.2"
2727

2828
lintOptions {
2929
checkReleaseBuilds false
@@ -33,8 +33,8 @@ android {
3333
defaultConfig {
3434
minSdkVersion 9
3535
targetSdkVersion 24
36-
versionCode 5
37-
versionName "1.0.5"
36+
versionCode 6
37+
versionName "1.0.6"
3838
}
3939

4040
buildTypes {

library/src/main/java/net/sjava/advancedasynctask/AdvancedAsyncTask.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,9 @@ public abstract class AdvancedAsyncTask<Params, Progress, Result> implements Mes
183183

184184
private static Handler getHandler() {
185185
synchronized (AdvancedAsyncTask.class) {
186-
if (sHandler == null)
186+
if (sHandler == null) {
187187
sHandler = new InternalHandler();
188+
}
188189

189190
return sHandler;
190191
}
@@ -296,7 +297,7 @@ private void postResultIfNotInvoked(Result result) {
296297

297298
private Result postResult(Result result) {
298299
@SuppressWarnings("unchecked")
299-
Message message = getHandler().obtainMessage(MESSAGE_POST_RESULT, new AdvancedAsyncTaskResult<Result>(this, result));
300+
Message message = getHandler().obtainMessage(MESSAGE_POST_RESULT, new AdvancedAsyncTaskResult<>(this, result));
300301
message.sendToTarget();
301302
return result;
302303
}
@@ -603,11 +604,12 @@ public static void execute(Runnable runnable) {
603604
* @see #doInBackground
604605
*/
605606
protected final void publishProgress(Progress... values) {
606-
if (isCancelled())
607+
if (isCancelled()) {
607608
return;
609+
}
608610

609611
getHandler().obtainMessage(MESSAGE_POST_PROGRESS,
610-
new AdvancedAsyncTaskResult<Progress>(this, values)).sendToTarget();
612+
new AdvancedAsyncTaskResult<>(this, values)).sendToTarget();
611613
}
612614

613615
void finish(Result result) {

library/src/main/java/net/sjava/advancedasynctask/AdvancedAsyncTaskCancelTimer.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,24 @@ public void onTick(long millisUntilFinished) {
4040
return;
4141
}
4242

43-
if(advancedAsyncTask.isCancelled())
43+
if(advancedAsyncTask.isCancelled()) {
4444
this.cancel();
45+
}
4546

46-
if(advancedAsyncTask.getStatus() == AdvancedAsyncTaskStatus.FINISHED)
47+
if(advancedAsyncTask.getStatus() == AdvancedAsyncTaskStatus.FINISHED) {
4748
this.cancel();
49+
}
4850
}
4951

5052
@Override
5153
public void onFinish() {
52-
if(advancedAsyncTask == null || advancedAsyncTask.isCancelled() )
54+
if(advancedAsyncTask == null || advancedAsyncTask.isCancelled() ) {
5355
return;
56+
}
5457

55-
if(advancedAsyncTask.getStatus() == AdvancedAsyncTaskStatus.FINISHED)
58+
if(advancedAsyncTask.getStatus() == AdvancedAsyncTaskStatus.FINISHED) {
5659
return;
60+
}
5761

5862
advancedAsyncTask.cancel(interrupt);
5963
}

0 commit comments

Comments
 (0)