Merge pull request alibaba#532 from alibaba/develop

Daily update
yang12sanpi · Oct 26, 2018 · 53c951a · 53c951a
2 parents 9de16a4 + fce3d78
commit 53c951a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 39 deletions.
diff --git a/arouter-api/src/main/java/com/alibaba/android/arouter/facade/Postcard.java b/arouter-api/src/main/java/com/alibaba/android/arouter/facade/Postcard.java
@@ -6,7 +6,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.v4.app.ActivityOptionsCompat;
@@ -19,8 +18,6 @@
 import com.alibaba.android.arouter.launcher.ARouter;
 
 import java.io.Serializable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 
 /**
@@ -190,31 +187,6 @@ public Postcard with(Bundle bundle) {
         return this;
     }
 
-    @IntDef({
-            Intent.FLAG_ACTIVITY_SINGLE_TOP,
-            Intent.FLAG_ACTIVITY_NEW_TASK,
-            Intent.FLAG_GRANT_WRITE_URI_PERMISSION,
-            Intent.FLAG_DEBUG_LOG_RESOLUTION,
-            Intent.FLAG_FROM_BACKGROUND,
-            Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT,
-            Intent.FLAG_ACTIVITY_CLEAR_TASK,
-            Intent.FLAG_ACTIVITY_CLEAR_TOP,
-            Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS,
-            Intent.FLAG_ACTIVITY_FORWARD_RESULT,
-            Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY,
-            Intent.FLAG_ACTIVITY_MULTIPLE_TASK,
-            Intent.FLAG_ACTIVITY_NO_ANIMATION,
-            Intent.FLAG_ACTIVITY_NO_USER_ACTION,
-            Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP,
-            Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED,
-            Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,
-            Intent.FLAG_ACTIVITY_TASK_ON_HOME,
-            Intent.FLAG_RECEIVER_REGISTERED_ONLY
-    })
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface FlagInt {
-    }
-
     /**
      * Set special flags controlling how this intent is handled.  Most values
      * here depend on the type of component being executed by the Intent,
@@ -223,11 +195,25 @@ public Postcard with(Bundle bundle) {
      * FLAG_RECEIVER_* flags are all for use with
      * {@link Context#sendBroadcast(Intent) Context.sendBroadcast()}.
      */
-    public Postcard withFlags(@FlagInt int flag) {
+    public Postcard withFlags(int flag) {
         this.flags = flag;
         return this;
     }
 
+    /**
+     * Add additional flags to the intent (or with existing flags
+     * value).
+     *
+     * @param flags The new flags to set.
+     * @return Returns the same Intent object, for chaining multiple calls
+     * into a single statement.
+     * @see #withFlags
+     */
+    public Postcard addFlags(int flags) {
+        this.flags |= flags;
+        return this;
+    }
+
     public int getFlags() {
         return flags;
     }
@@ -605,13 +591,16 @@ public String toString() {
                 "}\n" +
                 super.toString();
     }
+
     //增加设置intent的action
     private String action;
-    public String getAction(){
+
+    public String getAction() {
         return action;
     }
-    public Postcard withAction(String action){
-        this.action=action;
+
+    public Postcard withAction(String action) {
+        this.action = action;
         return this;
     }
 }
diff --git a/arouter-api/src/main/java/com/alibaba/android/arouter/launcher/ARouter.java b/arouter-api/src/main/java/com/alibaba/android/arouter/launcher/ARouter.java
@@ -100,6 +100,7 @@ public static synchronized void enableAutoInject() {
         _ARouter.enableAutoInject();
     }
 
+    @Deprecated
     public static boolean canAutoInject() {
         return _ARouter.canAutoInject();
     }

diff --git a/arouter-api/src/main/java/com/alibaba/android/arouter/launcher/_ARouter.java b/arouter-api/src/main/java/com/alibaba/android/arouter/launcher/_ARouter.java
@@ -416,16 +416,15 @@ private void runInMainThread(Runnable runnable) {
 
     /**
      * Start activity
-     *
-     * @param requestCode
-     * @param currentContext
-     * @param intent
-     * @param postcard
-     * @param callback
+     * @see ActivityCompat
      */
     private void startActivity(int requestCode, Context currentContext, Intent intent, Postcard postcard, NavigationCallback callback) {
         if (requestCode >= 0) {  // Need start for result
-            ActivityCompat.startActivityForResult((Activity) currentContext, intent, requestCode, postcard.getOptionsBundle());
+            if (currentContext instanceof Activity) {
+                ActivityCompat.startActivityForResult((Activity) currentContext, intent, requestCode, postcard.getOptionsBundle());
+            } else {
+                logger.warning(Consts.TAG, "Must use [navigation(activity, ...)] to support [startActivityForResult]");
+            }
         } else {
             ActivityCompat.startActivity(currentContext, intent, postcard.getOptionsBundle());
         }