修复添加好友后对话框不消失bug

Author: caiyg

android/app/src/io/jchat/android/JMessageHelper.java

@@ -323,17 +323,14 @@ public void getConvList(Callback successCallback, Callback errorCallback) {
      * @param callback 回调
      */
     @ReactMethod
-    public void addFriend(final String username, final Callback callback, final Callback failCallback) {
+    public void addFriend(final String username, final Callback callback) {
         mContext = getCurrentActivity();
         if (TextUtils.isEmpty(username)) {
             HandleResponseCode.onHandle(mContext, 802001, true);
-            failCallback.invoke();
         } else if (username.equals(JMessageClient.getMyInfo().getUserName())) {
             HandleResponseCode.onHandle(mContext, 1003, true);
-            failCallback.invoke();
         } else if (isExistConv(username)) {
             HandleResponseCode.onHandle(mContext, 810007, true);
-            failCallback.invoke();
         } else {
             final ProgressDialog dialog = new ProgressDialog(mContext);
             dialog.setMessage(mContext.getString(R.string.adding_hint));
@@ -350,7 +347,6 @@ public void gotResult(int status, String desc, UserInfo userInfo) {
                         callback.invoke(result);
                     } else {
                         HandleResponseCode.onHandle(mContext, status, false);
-                        failCallback.invoke();
                     }
                 }
             });

react-native-android/actions/conversationList.js

@@ -32,10 +32,6 @@ export function addFriend(username) {
 				type: types.ADD_FRIEND_SUCCESS,
 				conversation: JSON.parse(result)
 			});
-		}, () => {
-			dispatch ({
-				type: types.ADD_FRIEND_ERROR,
-			});
 		})
 	}
 }

react-native-android/containers/conv_fragment.js

@@ -208,14 +208,7 @@ export default class Conv extends Component {
     addFriend() {
         const { addFriend } = this.props.actions;
         addFriend(this.state.friendId);
-        var adding = convReducer.adding;
-        var error  = convReducer.error;
-        console.log('adding:  ' + adding);
-        if (adding !== undefined && !adding) {
-            this.dismissAddFriendDialog();
-        } else if (error !== undefined && error) {
-            this.setState({friendId: ''});
-        }
+        this.dismissAddFriendDialog();
         // JMessageHelper.addFriend(this.state.friendId, (result) => {
         //     this.dismissAddFriendDialog();
         //     var newDs = JSON.parse(result);

react-native-android/reducers/conversationList.js

@@ -51,22 +51,13 @@ export default function conversationList(state, action) {
 			var convList = [...state.convList];
 			convList.unshift(action.conversation);
 			dataSource = state.dataSource.cloneWithRows(convList);
-			console.log('convList: ' + convList);
 			return {
 				...state,
 				...action,
 				convList: convList,
 				dataSource,
 				adding: false
 			}
-		case types.ADD_FRIEND_ERROR:
-			console.log('error: ');
-			return {
-				...state,
-				...action,
-				adding: true,
-				error: true
-			}
 		case types.DELETE_CONVERSATION:
 			var selected = action.selected;
 			var convList = [...state.convList];