Merge remote-tracking branch 'origin/master'

Author: mcsong

README.md

@@ -1,5 +1,8 @@
 # AdvancedAsyncTask
-This library is enhanced for using AsyncTask api. 
+[![Release](https://img.shields.io/badge/jcenter-1.0.2-blue.svg)](https://bintray.com/mcsong/maven/advancedasynctask)  [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-AdvancedAsyncTask-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/2506)
+
+## Overview
+This library is enhanced for using AsyncTask api.
 
 ## Features
 - You can handle task's priority in task queue(from fifo queue to priority queue).
@@ -10,7 +13,7 @@ This library is enhanced for using AsyncTask api.
 Gradle
 ```groovy
     dependencies {
-    	compile 'net.sjava:advancedasynctask:1.0.1'
+    	compile 'net.sjava:advancedasynctask:1.0.2'
     }
 ```
 
@@ -19,7 +22,7 @@ Maven
     <dependency>
      <groupId>net.sjava</groupId>
      <artifactId>advancedasynctask</artifactId>
-     <version>1.0.1</version>
+     <version>1.0.2</version>
     </dependency>
 ```
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:2.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

demo/build.gradle

@@ -1,14 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
+
     defaultConfig {
         applicationId 'net.sjava.advancedasynctask.demo'
         minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 2
-        versionName "1.0.2"
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
     }
 
     buildTypes {
@@ -24,13 +25,12 @@ android {
     }
 
     productFlavors {
-
     }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    //compile project(':library')
-    compile 'com.android.support:appcompat-v7:23.1.0'
-    compile 'net.sjava:advancedasynctask:1.0.1'
+    compile project(':library')
+    compile 'com.android.support:appcompat-v7:24.0.0'
+    //compile 'net.sjava:advancedasynctask:1.0.0'
 }

gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

library/build.gradle

@@ -5,7 +5,7 @@ publish {
     userOrg = 'mcsong'
     groupId = 'net.sjava'
     artifactId = 'advancedasynctask'
-    publishVersion = '1.0.1'
+    publishVersion = '1.0.2'
     desc = 'Advanced Asynctask library for Android'
     website = 'https://github.com/mcsong/AdvancedAsyncTask'
     issueTracker = "${website}/issues"
@@ -22,16 +22,17 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     lintOptions {
+        checkReleaseBuilds false
         abortOnError false
     }
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 2
         versionName "1.0.1"
     }
@@ -43,6 +44,13 @@ android {
         }
     }
 
+    allprojects {
+        tasks.withType(Javadoc) {
+            options.addStringOption('Xdoclint:none', '-quiet')
+            options.addStringOption('encoding', 'UTF-8')
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -51,7 +59,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:appcompat-v7:24.0.0'
 }
 
 //apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'

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

@@ -176,7 +176,7 @@ public abstract class AdvancedAsyncTask<Params, Progress, Result> implements Mes
 	private WorkerRunnable<Params, Result> mWorker;
 	private FutureTask<Result> mFuture;
 
-	private volatile AsyncTaskStatus mStatus = AsyncTaskStatus.PENDING;
+	private volatile AdvancedAsyncTaskStatus mStatus = AdvancedAsyncTaskStatus.PENDING;
 
 	private final AtomicBoolean mCancelled = new AtomicBoolean();
 	private final AtomicBoolean mTaskInvoked = new AtomicBoolean();
@@ -289,7 +289,7 @@ private void postResultIfNotInvoked(Result result) {
 
 	private Result postResult(Result result) {
 		@SuppressWarnings("unchecked")
-		Message message = getHandler().obtainMessage(MESSAGE_POST_RESULT, new AsyncTaskResult<Result>(this, result));
+		Message message = getHandler().obtainMessage(MESSAGE_POST_RESULT, new AdvancedAsyncTaskResult<Result>(this, result));
 		message.sendToTarget();
 		return result;
 	}
@@ -299,7 +299,7 @@ private Result postResult(Result result) {
 	 *
 	 * @return The current status.
 	 */
-	public final AsyncTaskStatus getStatus() {
+	public final AdvancedAsyncTaskStatus getStatus() {
 		return mStatus;
 	}
 
@@ -546,7 +546,7 @@ public final AdvancedAsyncTask<Params, Progress, Result> execute(Params... param
 	 * @see #execute(Object[])
 	 */
 	public final AdvancedAsyncTask<Params, Progress, Result> executeOnExecutor(Executor exec, Params... params) {
-		if (mStatus != AsyncTaskStatus.PENDING) {
+		if (mStatus != AdvancedAsyncTaskStatus.PENDING) {
 			switch (mStatus) {
 				case RUNNING:
 					throw new IllegalStateException("Cannot execute task:"
@@ -558,7 +558,7 @@ public final AdvancedAsyncTask<Params, Progress, Result> executeOnExecutor(Execu
 			}
 		}
 
-		mStatus = AsyncTaskStatus.RUNNING;
+		mStatus = AdvancedAsyncTaskStatus.RUNNING;
 
 		onPreExecute();
 
@@ -600,7 +600,7 @@ protected final void publishProgress(Progress... values) {
 			return;
 
 		getHandler().obtainMessage(MESSAGE_POST_PROGRESS,
-				new AsyncTaskResult<Progress>(this, values)).sendToTarget();
+				new AdvancedAsyncTaskResult<Progress>(this, values)).sendToTarget();
 	}
 
 	void finish(Result result) {
@@ -610,7 +610,7 @@ void finish(Result result) {
 			onPostExecute(result);
 		}
 
-		mStatus = AsyncTaskStatus.FINISHED;
+		mStatus = AdvancedAsyncTaskStatus.FINISHED;
 	}
 
 }

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

@@ -3,6 +3,8 @@
 import android.os.CountDownTimer;
 
 /**
+ *
+ * Timer for cancelling registered AdvancedAsyncTask instance.
  *
  * Created by [email protected] on 2015-09-08.
  */
@@ -41,7 +43,7 @@ public void onTick(long millisUntilFinished) {
 		if(advancedAsyncTask.isCancelled())
 			this.cancel();
 
-		if(advancedAsyncTask.getStatus() == AsyncTaskStatus.FINISHED)
+		if(advancedAsyncTask.getStatus() == AdvancedAsyncTaskStatus.FINISHED)
 			this.cancel();
 	}
 
@@ -50,7 +52,7 @@ public void onFinish() {
 		if(advancedAsyncTask == null || advancedAsyncTask.isCancelled() )
 			return;
 
-		if(advancedAsyncTask.getStatus() == AsyncTaskStatus.FINISHED)
+		if(advancedAsyncTask.getStatus() == AdvancedAsyncTaskStatus.FINISHED)
 			return;
 
 		advancedAsyncTask.cancel(interrupt);

…a/advancedasynctask/AsyncTaskResult.java …edasynctask/AdvancedAsyncTaskResult.javalibrary/src/main/java/net/sjava/advancedasynctask/AsyncTaskResult.java renamed to library/src/main/java/net/sjava/advancedasynctask/AdvancedAsyncTaskResult.java library/src/main/java/net/sjava/advancedasynctask/AsyncTaskResult.java renamed to library/src/main/java/net/sjava/advancedasynctask/AdvancedAsyncTaskResult.java

@@ -6,11 +6,11 @@
  *
  */
 @SuppressWarnings({"RawUseOfParameterizedType"})
-class AsyncTaskResult<Data> {
+class AdvancedAsyncTaskResult<Data> {
 	final AdvancedAsyncTask mTask;
 	final Data[] mData;
 
-	AsyncTaskResult(AdvancedAsyncTask task, Data... data) {
+	AdvancedAsyncTaskResult(AdvancedAsyncTask task, Data... data) {
 		mTask = task;
 		mData = data;
 	}

…a/advancedasynctask/AsyncTaskStatus.java …edasynctask/AdvancedAsyncTaskStatus.javalibrary/src/main/java/net/sjava/advancedasynctask/AsyncTaskStatus.java renamed to library/src/main/java/net/sjava/advancedasynctask/AdvancedAsyncTaskStatus.java library/src/main/java/net/sjava/advancedasynctask/AsyncTaskStatus.java renamed to library/src/main/java/net/sjava/advancedasynctask/AdvancedAsyncTaskStatus.java

@@ -4,7 +4,7 @@
  * Indicates the current status of the task. Each status will be set only once
  * during the lifetime of a task.
  */
-enum AsyncTaskStatus {
+public enum AdvancedAsyncTaskStatus {
 	/**
 	 * Indicates that the task has not been executed yet.
 	 */

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

@@ -4,6 +4,7 @@
 import java.util.concurrent.Executor;
 
 /**
+ *
  *
  * Created by [email protected] on 2015-09-09.
  */