diff --git a/TMessagesProj/src/main/java/org/telegram/group/GroupViewModel.java b/TMessagesProj/src/main/java/org/telegram/group/GroupViewModel.java index 9555f29..4f58a0d 100644 --- a/TMessagesProj/src/main/java/org/telegram/group/GroupViewModel.java +++ b/TMessagesProj/src/main/java/org/telegram/group/GroupViewModel.java @@ -4,7 +4,6 @@ import android.content.SharedPreferences; import android.support.annotation.NonNull; import android.text.TextUtils; -import android.util.Log; import org.telegram.messenger.ApplicationLoader; import org.telegram.messenger.MessagesController; @@ -178,7 +177,6 @@ * 2.查询是否能自主删除(选择非自主删除的不能退出) */ public synchronized static Completable query(final List groupId) { - Log.e("siyehua", "query"); return Observable.create(new ObservableOnSubscribe>() { @Override public void subscribe(ObservableEmitter> observableEmitter) throws Exception { @@ -229,34 +227,25 @@ * @return true:可退出, false:不可退出 */ public static boolean checkGroup(final String groupId) { - Log.e("siyehua1", "groupId" + groupId); if (response == null || response.getAttributes() == null) { - return true; + return false; } - Log.e("siyehua2", "groupId" + groupId); - List listBeans = response.getAttributes().getList(); if (listBeans == null) { - return true; + return false; } - Log.e("siyehua3", "groupId" + groupId); for (int i = 0; i < listBeans.size(); i++) { if (listBeans.get(i).getGroupId().equals(groupId)) { - Log.e("siyehua4", "groupId" + groupId); - - if (System.currentTimeMillis() < listBeans.get(i).getExpiredDate()) { - Log.e("siyehua5", "groupId" + groupId); - - return false; + if (System.currentTimeMillis() > listBeans.get(i).getExpiredDate()) { + //只有在这个时候才能删除,其他情况都不允许 + return true; } break; } } - Log.e("siyehua6", "groupId" + groupId); - - return true; + return false; } /**