Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
2.0.5 /2014-05-09/
  • Loading branch information
yanchenko committed May 9, 2014
2 parents 78bf355 + 3bd904b commit b2b00ef
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 10 deletions.
4 changes: 4 additions & 0 deletions CHANGES
@@ -1,3 +1,7 @@
2.0.5 /2014-05-09/:
* Delete object: made a method public.
* IntentService: added RESULT_SUCCESS & RESULT_FAILURE codes.

2.0.4 /2014-04-25/:
* EntityCursorAdapter: changed constructors.
* ArrayAdapter: LayoutInflater getter.
Expand Down
2 changes: 2 additions & 0 deletions droidparts-samples/DroidPartsGram/AndroidManifest.xml
Expand Up @@ -23,6 +23,7 @@

<activity
android:name=".activity.MainActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >
<intent-filter>
Expand All @@ -34,6 +35,7 @@

<activity
android:name=".activity.SettingsActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/settings" />

<service android:name=".service.ImageIntentService" />
Expand Down
2 changes: 1 addition & 1 deletion droidparts-support/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.droidparts</groupId>
<artifactId>droidparts-parent</artifactId>
<version>2.0.4</version>
<version>2.0.5</version>
</parent>

<artifactId>droidparts-support</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion droidparts-test/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.droidparts</groupId>
<artifactId>droidparts-parent</artifactId>
<version>2.0.4</version>
<version>2.0.5</version>
</parent>

<artifactId>droidparts-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion droidparts/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.droidparts</groupId>
<artifactId>droidparts-parent</artifactId>
<version>2.0.4</version>
<version>2.0.5</version>
</parent>

<artifactId>droidparts</artifactId>
Expand Down
Expand Up @@ -15,14 +15,12 @@
*/
package org.droidparts.concurrent.service;

import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;

import java.lang.reflect.Field;

import org.droidparts.Injector;
import org.droidparts.util.L;

import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
Expand All @@ -35,6 +33,9 @@ public abstract class IntentService extends android.app.IntentService {
private static final String EXTRA_RESULT_RECEIVER = "__result_receiver__";

// out
public static final int RESULT_SUCCESS = Activity.RESULT_OK;
public static final int RESULT_FAILURE = Activity.RESULT_CANCELED;
//
public static final String EXTRA_ACTION = "__action__";
public static final String EXTRA_EXCEPTION = "__exception__";

Expand Down Expand Up @@ -76,13 +77,13 @@ protected final void onHandleIntent(Intent intent) {
try {
data = onExecute(action, data);
if (resultReceiver != null) {
resultReceiver.send(RESULT_OK, data);
resultReceiver.send(RESULT_SUCCESS, data);
}
} catch (Exception e) {
L.d(e);
if (resultReceiver != null) {
data.putSerializable(EXTRA_EXCEPTION, e);
resultReceiver.send(RESULT_CANCELED, data);
resultReceiver.send(RESULT_FAILURE, data);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion droidparts/src/org/droidparts/persist/sql/stmt/Delete.java
Expand Up @@ -41,7 +41,7 @@ public Delete<EntityType> where(String columnName, Is operator,
}

@Override
protected Delete<EntityType> where(Where where) {
public Delete<EntityType> where(Where where) {
return (Delete<EntityType>) super.where(where);
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -12,7 +12,7 @@
<artifactId>droidparts-parent</artifactId>
<packaging>pom</packaging>

<version>2.0.4</version>
<version>2.0.5</version>

<name>DroidParts - Parent</name>
<description>A carefully crafted Android framework.</description>
Expand Down

0 comments on commit b2b00ef

Please sign in to comment.