From 6283cb26f68f5c95ad3134e8ef040e62ed552cc8 Mon Sep 17 00:00:00 2001
From: Hevin <liuhw@jpush.cn>
Date: Fri, 13 Oct 2017 10:12:16 +0800
Subject: [PATCH] Remove deprecated method

setTagsWithAlias
---
 src/android/JPushPlugin.java  | 21 +--------------------
 src/ios/Plugins/JPushPlugin.h |  3 ---
 src/ios/Plugins/JPushPlugin.m | 17 -----------------
 www/JPushPlugin.js            | 14 --------------
 4 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/src/android/JPushPlugin.java b/src/android/JPushPlugin.java
index f0491f0..18ac51a 100644
--- a/src/android/JPushPlugin.java
+++ b/src/android/JPushPlugin.java
@@ -527,24 +527,6 @@ public class JPushPlugin extends CordovaPlugin {
         eventCallbackMap.put(sequence, callbackContext);
     }
 
-    void setTagsWithAlias(JSONArray data, CallbackContext callbackContext) {
-        HashSet<String> tags = new HashSet<String>();
-        String alias;
-        try {
-            alias = data.getString(0);
-            JSONArray tagsArray = data.getJSONArray(1);
-            for (int i = 0; i < tagsArray.length(); i++) {
-                tags.add(tagsArray.getString(i));
-            }
-            JPushInterface.setAliasAndTags(mContext,
-                    alias, tags, mTagWithAliasCallback);
-            callbackContext.success();
-        } catch (JSONException e) {
-            e.printStackTrace();
-            callbackContext.error("Error reading tagAlias JSON");
-        }
-    }
-
     void getConnectionState(JSONArray data, CallbackContext callback) {
         boolean isConnected = JPushInterface.getConnectionState(cordovaActivity.getApplicationContext());
         callback.success(String.valueOf(isConnected));
@@ -553,8 +535,7 @@ public class JPushPlugin extends CordovaPlugin {
     /**
      *   自定义通知行为，声音、震动、呼吸灯等。
      */
-    void setBasicPushNotificationBuilder(JSONArray data,
-                                         CallbackContext callbackContext) {
+    void setBasicPushNotificationBuilder(JSONArray data, CallbackContext callbackContext) {
         BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(
                 this.cordova.getActivity());
         builder.developerArg0 = "Basic builder 1";
diff --git a/src/ios/Plugins/JPushPlugin.h b/src/ios/Plugins/JPushPlugin.h
index 7c7da19..2228d04 100644
--- a/src/ios/Plugins/JPushPlugin.h
+++ b/src/ios/Plugins/JPushPlugin.h
@@ -17,8 +17,6 @@
 
 //以下为js中可调用接口
 //设置标签、别名
--(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command;
-
 -(void)setTags:(CDVInvokedUrlCommand*)command;
 -(void)addTags:(CDVInvokedUrlCommand*)command;
 -(void)deleteTags:(CDVInvokedUrlCommand*)command;
@@ -76,7 +74,6 @@
 /*
  *  以下为js中可监听到的事件
  *  jpush.openNotification      点击推送消息启动或唤醒app
- *  jpush.setTagsWithAlias      设置标签、别名完成
  *  jpush.receiveMessage        收到自定义消息
  *  jpush.receiveNotification   前台收到推送
  *  jpush.backgroundNotification 后台收到推送
diff --git a/src/ios/Plugins/JPushPlugin.m b/src/ios/Plugins/JPushPlugin.m
index 5281292..3351702 100644
--- a/src/ios/Plugins/JPushPlugin.m
+++ b/src/ios/Plugins/JPushPlugin.m
@@ -87,23 +87,6 @@
     });
 }
 
--(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{
-    NSString *alias = [command argumentAtIndex:0];
-    NSArray  *tags  = [command argumentAtIndex:1];
-
-    [JPUSHService setTags:[NSSet setWithArray:tags]
-                    alias:alias
-    fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) {
-        CDVPluginResult *result;
-        if (iResCode == 0) {
-            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil];
-        } else {
-            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil];
-        }
-        [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
-    }];
-}
-
 -(void)setTags:(CDVInvokedUrlCommand*)command {
     NSDictionary* params = [command.arguments objectAtIndex:0];
     NSNumber* sequence = params[@"sequence"];
diff --git a/www/JPushPlugin.js b/www/JPushPlugin.js
index a9c3266..e822a8b 100644
--- a/www/JPushPlugin.js
+++ b/www/JPushPlugin.js
@@ -70,20 +70,6 @@ JPushPlugin.prototype.clearLocalNotifications = function () {
   }
 }
 
-JPushPlugin.prototype.setTagsWithAlias = function (tags, alias, successCallback, errorCallback) {
-  if (tags == null) {
-    this.setAlias(alias)
-    return
-  }
-  if (alias == null) {
-    this.setTags(tags)
-    return
-  }
-  var arrayTagWithAlias = [tags]
-  arrayTagWithAlias.unshift(alias)
-  this.callNative('setTagsWithAlias', arrayTagWithAlias, successCallback, errorCallback)
-}
-
 /**
  * 设置标签。
  * 注意：该接口是覆盖逻辑，而不是增量逻辑。即新的调用会覆盖之前的设置。