From ae9512b39f7715883435dcf2b40eda9fe934fa1d Mon Sep 17 00:00:00 2001 From: Audrey OLIVIER Date: Mon, 16 Jul 2018 17:44:38 +0200 Subject: [PATCH 1/3] Remove Room.getLiveState() and keep only Room.getState() because they are similar. --- .../vector/activity/CommonActivityUtils.java | 4 +-- .../activity/IntegrationManagerActivity.kt | 8 ++--- .../vector/activity/VectorHomeActivity.java | 4 +-- .../activity/VectorMemberDetailsActivity.java | 6 ++-- .../vector/activity/VectorRoomActivity.java | 26 +++++++------- .../VectorRoomInviteMembersActivity.java | 2 +- .../adapters/VectorMessagesAdapter.java | 4 +-- .../adapters/VectorMessagesAdapterHelper.java | 6 ++-- .../adapters/VectorParticipantsAdapter.java | 2 +- .../VectorRoomDetailsMembersAdapter.java | 8 ++--- .../VectorSearchMessagesListAdapter.java | 4 +-- .../fragments/VectorMessageListFragment.java | 2 +- .../fragments/VectorRecentsListFragment.java | 4 +-- .../VectorRoomDetailsMembersFragment.java | 2 +- .../fragments/VectorRoomSettingsFragment.java | 34 +++++++++---------- .../VectorSearchRoomFilesListFragment.java | 6 ++-- .../notifications/RoomsNotifications.java | 16 ++++----- .../vector/services/EventStreamService.java | 2 +- .../im/vector/util/MatrixSdkExtensions.kt | 4 +-- .../im/vector/util/SlashCommandsParser.java | 2 +- .../main/java/im/vector/util/VectorUtils.java | 6 ++-- .../im/vector/widgets/WidgetsManager.java | 8 ++--- 22 files changed, 80 insertions(+), 80 deletions(-) diff --git a/vector/src/main/java/im/vector/activity/CommonActivityUtils.java b/vector/src/main/java/im/vector/activity/CommonActivityUtils.java index 7f78a50968..9e0dfee9cc 100755 --- a/vector/src/main/java/im/vector/activity/CommonActivityUtils.java +++ b/vector/src/main/java/im/vector/activity/CommonActivityUtils.java @@ -1020,8 +1020,8 @@ public static Intent buildIntentPreviewRoom(String aMatrixId, String aRoomId, Co Room room = session.getDataHandler().getRoom(aRoomId); // get the room alias (if any) for the preview data - if ((null != room) && (null != room.getLiveState())) { - roomAlias = room.getLiveState().getAlias(); + if ((null != room) && (null != room.getState())) { + roomAlias = room.getState().getAlias(); } intentRetCode = new Intent(aContext, aTargetActivity); diff --git a/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.kt b/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.kt index 9ac5242ad3..5c209acab6 100755 --- a/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.kt +++ b/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.kt @@ -290,7 +290,7 @@ class IntegrationManagerActivity : AbstractWidgetActivity() { Log.d(LOG_TAG, "Received request canSendEvent in room " + mRoom!!.roomId) - val member = mRoom!!.liveState.getMember(mSession!!.myUserId) + val member = mRoom!!.state.getMember(mSession!!.myUserId) if (null == member || !TextUtils.equals(RoomMember.MEMBERSHIP_JOIN, member.membership)) { sendError(getString(R.string.widget_integration_must_be_in_room), eventData) @@ -302,7 +302,7 @@ class IntegrationManagerActivity : AbstractWidgetActivity() { Log.d(LOG_TAG, "## canSendEvent() : eventType $eventType isState $isState") - val powerLevels = mRoom!!.liveState.powerLevels + val powerLevels = mRoom!!.state.powerLevels val userPowerLevel = powerLevels!!.getUserPowerLevel(mSession!!.myUserId) @@ -374,7 +374,7 @@ class IntegrationManagerActivity : AbstractWidgetActivity() { } Log.d(LOG_TAG, "Received request join rules in room " + mRoom!!.roomId) - val joinedEvents = mRoom!!.liveState.getStateEvents(HashSet(Arrays.asList(Event.EVENT_TYPE_STATE_ROOM_JOIN_RULES))) + val joinedEvents = mRoom!!.state.getStateEvents(HashSet(Arrays.asList(Event.EVENT_TYPE_STATE_ROOM_JOIN_RULES))) if (joinedEvents.size > 0) { Log.d(LOG_TAG, "Received request join rules returns " + joinedEvents[joinedEvents.size - 1]) @@ -424,7 +424,7 @@ class IntegrationManagerActivity : AbstractWidgetActivity() { Log.d(LOG_TAG, "Received request to get options for bot " + userId + " in room " + mRoom!!.roomId + " requested") - val stateEvents = mRoom!!.liveState.getStateEvents(HashSet(Arrays.asList(Event.EVENT_TYPE_ROOM_BOT_OPTIONS))) + val stateEvents = mRoom!!.state.getStateEvents(HashSet(Arrays.asList(Event.EVENT_TYPE_ROOM_BOT_OPTIONS))) var botOptionsEvent: Event? = null val stateKey = "_$userId" diff --git a/vector/src/main/java/im/vector/activity/VectorHomeActivity.java b/vector/src/main/java/im/vector/activity/VectorHomeActivity.java index fccd277e8b..13566d5448 100644 --- a/vector/src/main/java/im/vector/activity/VectorHomeActivity.java +++ b/vector/src/main/java/im/vector/activity/VectorHomeActivity.java @@ -1606,8 +1606,8 @@ public void onPreviewRoom(MXSession session, String roomId) { String roomAlias = null; Room room = session.getDataHandler().getRoom(roomId); - if ((null != room) && (null != room.getLiveState())) { - roomAlias = room.getLiveState().getAlias(); + if ((null != room) && (null != room.getState())) { + roomAlias = room.getState().getAlias(); } final RoomPreviewData roomPreviewData = new RoomPreviewData(mSession, roomId, null, roomAlias, null); diff --git a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java index 804d27a170..1904d165fb 100644 --- a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java +++ b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java @@ -464,7 +464,7 @@ public void onClick(DialogInterface dialog, int which) { case ITEM_ACTION_SET_DEFAULT_POWER_LEVEL: if (null != mRoom) { int defaultPowerLevel = 0; - PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + PowerLevels powerLevels = mRoom.getState().getPowerLevels(); if (null != powerLevels) { defaultPowerLevel = powerLevels.users_default; @@ -746,7 +746,7 @@ private boolean populateDevicesListAdapter(MXUsersDevicesMap aDevi * @param callback the callback with the created event */ private void updateUserPowerLevels(final String userId, final int newPowerLevel, final ApiCallback callback) { - PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + PowerLevels powerLevels = mRoom.getState().getPowerLevels(); int currentSelfPowerLevel = 0; if (null != powerLevels) { @@ -826,7 +826,7 @@ private List supportedActionsList() { int adminCount = 0; if (null != mRoom) { - powerLevels = mRoom.getLiveState().getPowerLevels(); + powerLevels = mRoom.getState().getPowerLevels(); } mMemberAvatarBadgeImageView.setVisibility(View.GONE); diff --git a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java index 2f5014b71a..40ca2f9b3b 100755 --- a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java +++ b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java @@ -1711,7 +1711,7 @@ private boolean isUserAllowedToStartConfCall() { Log.d(LOG_TAG, "## isUserAllowedToStartConfCall(): conference in progress"); isAllowed = true; } else if ((null != mRoom) && (mRoom.getActiveMembers().size() > 2)) { - PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + PowerLevels powerLevels = mRoom.getState().getPowerLevels(); if (null != powerLevels) { // to start a conf call, the user MUST have the power to invite someone (CFU) @@ -3099,9 +3099,9 @@ public void onClick(View view) { private boolean canSendMessages() { boolean canSendMessage = false; - if ((null != mRoom) && (null != mRoom.getLiveState())) { + if ((null != mRoom) && (null != mRoom.getState())) { canSendMessage = true; - PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + PowerLevels powerLevels = mRoom.getState().getPowerLevels(); if (null != powerLevels) { canSendMessage = powerLevels.maySendMessage(mMyUserId); @@ -3115,7 +3115,7 @@ private boolean canSendMessages() { * Check if the user can send a message in this room */ private void checkSendEventStatus() { - if ((null != mRoom) && (null != mRoom.getLiveState())) { + if ((null != mRoom) && (null != mRoom.getState())) { boolean canSendMessage = canSendMessages(); mSendingMessagesLayout.setVisibility(canSendMessage ? View.VISIBLE : View.GONE); mCanNotPostTextView.setVisibility(!canSendMessage ? View.VISIBLE : View.GONE); @@ -3265,10 +3265,10 @@ private void manageBannedHeader(RoomMember member) { if (TextUtils.equals(member.membership, RoomMember.MEMBERSHIP_BAN)) { invitationTextView.setText(getString(R.string.has_been_banned, - VectorUtils.getRoomDisplayName(this, mSession, mRoom), mRoom.getLiveState().getMemberName(member.mSender))); + VectorUtils.getRoomDisplayName(this, mSession, mRoom), mRoom.getState().getMemberName(member.mSender))); } else { invitationTextView.setText(getString(R.string.has_been_kicked, - VectorUtils.getRoomDisplayName(this, mSession, mRoom), mRoom.getLiveState().getMemberName(member.mSender))); + VectorUtils.getRoomDisplayName(this, mSession, mRoom), mRoom.getState().getMemberName(member.mSender))); } TextView subInvitationTextView = findViewById(R.id.room_preview_subinvitation_textview); @@ -3764,7 +3764,7 @@ private void onRoomTitleClick() { titleText.setText(R.string.room_info_room_name); final EditText textInput = dialogView.findViewById(R.id.dialog_edit_text); - textInput.setText(mRoom.getLiveState().name); + textInput.setText(mRoom.getState().name); // set dialog message alertDialogBuilder @@ -3831,7 +3831,7 @@ private void onRoomTopicClick() { titleText.setText(R.string.room_info_room_topic); final EditText textInput = dialogView.findViewById(R.id.dialog_edit_text); - textInput.setText(mRoom.getLiveState().topic); + textInput.setText(mRoom.getState().topic); // set dialog message alertDialogBuilder @@ -3890,7 +3890,7 @@ private void addRoomHeaderClickListeners() { @Override public void onClick(View v) { // sanity checks : reported by GA - if ((null != mRoom) && (null != mRoom.getLiveState())) { + if ((null != mRoom) && (null != mRoom.getState())) { if (MatrixSdkExtensionsKt.isPowerLevelEnoughForAvatarUpdate(mRoom, mSession)) { // need to check if the camera permission has been granted if (CommonActivityUtils.checkPermissions(CommonActivityUtils.REQUEST_CODE_PERMISSION_ROOM_DETAILS, VectorRoomActivity.this)) { @@ -3914,9 +3914,9 @@ public void onClick(View v) { @Override public void onClick(View v) { // sanity checks : reported by GA - if ((null != mRoom) && (null != mRoom.getLiveState())) { + if ((null != mRoom) && (null != mRoom.getState())) { boolean canUpdateTitle = false; - PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + PowerLevels powerLevels = mRoom.getState().getPowerLevels(); if (null != powerLevels) { int powerLevel = powerLevels.getUserPowerLevel(mSession.getMyUserId()); @@ -3941,9 +3941,9 @@ public void onClick(View v) { @Override public void onClick(View v) { // sanity checks : reported by GA - if ((null != mRoom) && (null != mRoom.getLiveState())) { + if ((null != mRoom) && (null != mRoom.getState())) { boolean canUpdateTopic = false; - PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + PowerLevels powerLevels = mRoom.getState().getPowerLevels(); if (null != powerLevels) { int powerLevel = powerLevels.getUserPowerLevel(mSession.getMyUserId()); diff --git a/vector/src/main/java/im/vector/activity/VectorRoomInviteMembersActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomInviteMembersActivity.java index fee0fadc1e..d8e2d59707 100755 --- a/vector/src/main/java/im/vector/activity/VectorRoomInviteMembersActivity.java +++ b/vector/src/main/java/im/vector/activity/VectorRoomInviteMembersActivity.java @@ -319,7 +319,7 @@ private void finish(final List participantAdapterItems) // if a room is defined if (null != mRoom) { // the room members must not be added again - Collection members = mRoom.getLiveState().getDisplayableMembers(); + Collection members = mRoom.getState().getDisplayableMembers(); for (RoomMember member : members) { if (TextUtils.equals(member.membership, RoomMember.MEMBERSHIP_JOIN) || TextUtils.equals(member.membership, RoomMember.MEMBERSHIP_INVITE)) { hiddenUserIds.add(member.getUserId()); diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java index 657e74242e..d9bbbc04b7 100755 --- a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java +++ b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java @@ -2569,8 +2569,8 @@ private void onMessageClick(final Event event, final String textMsg, final View // need the minimum power level to redact an event Room room = mSession.getDataHandler().getRoom(event.roomId); - if ((null != room) && (null != room.getLiveState().getPowerLevels())) { - PowerLevels powerLevels = room.getLiveState().getPowerLevels(); + if ((null != room) && (null != room.getState().getPowerLevels())) { + PowerLevels powerLevels = room.getState().getPowerLevels(); canBeRedacted = powerLevels.getUserPowerLevel(mSession.getMyUserId()) >= powerLevels.redact; } } diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java index 59d7debe5a..8c7ed096d6 100755 --- a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java +++ b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java @@ -225,11 +225,11 @@ public void onClick(View v) { */ private void refreshGroupFlairView(final View groupFlairView, final Event event, final Set groupIdsSet, final String tag) { Log.d(LOG_TAG, "## refreshGroupFlairView () : " + event.sender + " allows flair to " + groupIdsSet); - Log.d(LOG_TAG, "## refreshGroupFlairView () : room related groups " + mRoom.getLiveState().getRelatedGroups()); + Log.d(LOG_TAG, "## refreshGroupFlairView () : room related groups " + mRoom.getState().getRelatedGroups()); if (!groupIdsSet.isEmpty()) { // keeps only the intersections - groupIdsSet.retainAll(mRoom.getLiveState().getRelatedGroups()); + groupIdsSet.retainAll(mRoom.getState().getRelatedGroups()); } Log.d(LOG_TAG, "## refreshGroupFlairView () : group ids to display " + groupIdsSet); @@ -363,7 +363,7 @@ private void refreshGroupFlairView(final View groupFlairView, final Event event) } // Check whether there are some related groups to this room - if (mRoom.getLiveState().getRelatedGroups().isEmpty()) { + if (mRoom.getState().getRelatedGroups().isEmpty()) { Log.d(LOG_TAG, "## refreshGroupFlairView () : no related group"); groupFlairView.setVisibility(View.GONE); return; diff --git a/vector/src/main/java/im/vector/adapters/VectorParticipantsAdapter.java b/vector/src/main/java/im/vector/adapters/VectorParticipantsAdapter.java index 15ef61ed0f..5f89a3d7a1 100755 --- a/vector/src/main/java/im/vector/adapters/VectorParticipantsAdapter.java +++ b/vector/src/main/java/im/vector/adapters/VectorParticipantsAdapter.java @@ -276,7 +276,7 @@ private void fillUsedMembersList() { Room fromRoom = store.getRoom(mRoomId); if (null != fromRoom) { - Collection members = fromRoom.getLiveState().getDisplayableMembers(); + Collection members = fromRoom.getState().getDisplayableMembers(); for (RoomMember member : members) { if (TextUtils.equals(member.membership, RoomMember.MEMBERSHIP_JOIN) || TextUtils.equals(member.membership, RoomMember.MEMBERSHIP_INVITE)) { mUsedMemberUserIds.add(member.getUserId()); diff --git a/vector/src/main/java/im/vector/adapters/VectorRoomDetailsMembersAdapter.java b/vector/src/main/java/im/vector/adapters/VectorRoomDetailsMembersAdapter.java index 4f11741e60..7461eb420f 100644 --- a/vector/src/main/java/im/vector/adapters/VectorRoomDetailsMembersAdapter.java +++ b/vector/src/main/java/im/vector/adapters/VectorRoomDetailsMembersAdapter.java @@ -318,7 +318,7 @@ public void run() { Collection activeMembers = mRoom.getActiveMembers(); String myUserId = mSession.getMyUserId(); - final PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + final PowerLevels powerLevels = mRoom.getState().getPowerLevels(); // search loop to extract the following members: current user, invited, administrator and others for (RoomMember member : activeMembers) { @@ -348,11 +348,11 @@ public void run() { } // add 3rd party invite - Collection thirdPartyInvites = mRoom.getLiveState().thirdPartyInvites(); + Collection thirdPartyInvites = mRoom.getState().thirdPartyInvites(); for (RoomThirdPartyInvite invite : thirdPartyInvites) { // If the home server has converted the 3pid invite into a room member, do not show it - if (null == mRoom.getLiveState().memberWithThirdPartyInviteToken(invite.token)) { + if (null == mRoom.getState().memberWithThirdPartyInviteToken(invite.token)) { ParticipantAdapterItem participant = new ParticipantAdapterItem(invite.display_name, "", null, true); if ((!isSearchEnabled) || participant.contains(mSearchPattern)) { @@ -754,7 +754,7 @@ public View getChildView(final int aGroupPosition, final int aChildPosition, boo PowerLevels powerLevels = null; if (null != mRoom) { - if (null != (powerLevels = mRoom.getLiveState().getPowerLevels())) { + if (null != (powerLevels = mRoom.getState().getPowerLevels())) { if (powerLevels.getUserPowerLevel(participant.mUserId) >= CommonActivityUtils.UTILS_POWER_LEVEL_ADMIN) { viewHolder.mMemberAvatarBadgeImageView.setVisibility(View.VISIBLE); viewHolder.mMemberAvatarBadgeImageView.setImageResource(R.drawable.admin_icon); diff --git a/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java b/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java index d857ad48fa..452d5082a8 100755 --- a/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java +++ b/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java @@ -111,7 +111,7 @@ public View getView(int position, View convertView2, ViewGroup parent) { RoomState roomState = row.getRoomState(); if (null == roomState) { - roomState = room.getLiveState(); + roomState = room.getState(); } // refresh the avatar @@ -127,7 +127,7 @@ public View getView(int position, View convertView2, ViewGroup parent) { // display the body TextView bodyTextView = convertView.findViewById(R.id.messagesAdapter_body); // set the message text - EventDisplay display = new RiotEventDisplay(mContext, event, (null != room) ? room.getLiveState() : null); + EventDisplay display = new RiotEventDisplay(mContext, event, (null != room) ? room.getState() : null); CharSequence text = display.getTextualDisplay(); if (null == text) { diff --git a/vector/src/main/java/im/vector/fragments/VectorMessageListFragment.java b/vector/src/main/java/im/vector/fragments/VectorMessageListFragment.java index 66139f961f..66a07eace5 100755 --- a/vector/src/main/java/im/vector/fragments/VectorMessageListFragment.java +++ b/vector/src/main/java/im/vector/fragments/VectorMessageListFragment.java @@ -1111,7 +1111,7 @@ public void onAvatarClick(String userId) { public boolean onAvatarLongClick(String userId) { if (getActivity() instanceof VectorRoomActivity) { try { - RoomState state = mRoom.getLiveState(); + RoomState state = mRoom.getState(); if (null != state) { String displayName = state.getMemberName(userId); diff --git a/vector/src/main/java/im/vector/fragments/VectorRecentsListFragment.java b/vector/src/main/java/im/vector/fragments/VectorRecentsListFragment.java index e9b3d3492d..eb4b5621ba 100644 --- a/vector/src/main/java/im/vector/fragments/VectorRecentsListFragment.java +++ b/vector/src/main/java/im/vector/fragments/VectorRecentsListFragment.java @@ -684,8 +684,8 @@ public void onPreviewRoom(MXSession session, String roomId) { String roomAlias = null; Room room = session.getDataHandler().getRoom(roomId); - if ((null != room) && (null != room.getLiveState())) { - roomAlias = room.getLiveState().getAlias(); + if ((null != room) && (null != room.getState())) { + roomAlias = room.getState().getAlias(); } final RoomPreviewData roomPreviewData = new RoomPreviewData(mSession, roomId, null, roomAlias, null); diff --git a/vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java b/vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java index 87847c6dc7..951a7e90cc 100755 --- a/vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java +++ b/vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java @@ -528,7 +528,7 @@ private boolean isUserAdmin() { if ((null != mRoom) && (null != mSession)) { PowerLevels powerLevels; - if (null != (powerLevels = mRoom.getLiveState().getPowerLevels())) { + if (null != (powerLevels = mRoom.getState().getPowerLevels())) { String userId = mSession.getMyUserId(); isAdmin = (null != userId) && (powerLevels.getUserPowerLevel(userId) >= CommonActivityUtils.UTILS_POWER_LEVEL_ADMIN); } diff --git a/vector/src/main/java/im/vector/fragments/VectorRoomSettingsFragment.java b/vector/src/main/java/im/vector/fragments/VectorRoomSettingsFragment.java index f73d34eca2..d54dea6354 100755 --- a/vector/src/main/java/im/vector/fragments/VectorRoomSettingsFragment.java +++ b/vector/src/main/java/im/vector/fragments/VectorRoomSettingsFragment.java @@ -682,7 +682,7 @@ private void updatePreferenceAccessFromPowerLevel() { // cannot refresh if there is no valid session / room if ((null != mRoom) && (null != mSession)) { - PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + PowerLevels powerLevels = mRoom.getState().getPowerLevels(); if (null != powerLevels) { int powerLevel = powerLevels.getUserPowerLevel(mSession.getMyUserId()); @@ -717,7 +717,7 @@ private void updatePreferenceAccessFromPowerLevel() { if (null != mRoomAccessRulesListPreference) { mRoomAccessRulesListPreference.setEnabled(isAdmin && isConnected); mRoomAccessRulesListPreference.setWarningIconVisible((0 == mRoom.getAliases().size()) - && !TextUtils.equals(RoomState.JOIN_RULE_INVITE, mRoom.getLiveState().join_rule)); + && !TextUtils.equals(RoomState.JOIN_RULE_INVITE, mRoom.getState().join_rule)); } // room read history: admin only @@ -751,7 +751,7 @@ private void updatePreferenceUiValues() { // update the room name preference if (null != mRoomNameEditTxt) { - value = mRoom.getLiveState().name; + value = mRoom.getState().name; mRoomNameEditTxt.setSummary(value); mRoomNameEditTxt.setText(value); } @@ -765,7 +765,7 @@ private void updatePreferenceUiValues() { // update room directory visibility // if (null != mRoomDirectoryVisibilitySwitch) { -// boolean isRoomPublic = TextUtils.equals(mRoom.getVisibility()/*getLiveState().visibility ou .isPublic()*/, RoomState.DIRECTORY_VISIBILITY_PUBLIC); +// boolean isRoomPublic = TextUtils.equals(mRoom.getVisibility()/*getState().visibility ou .isPublic()*/, RoomState.DIRECTORY_VISIBILITY_PUBLIC); // if (isRoomPublic !isRoomPublic= mRoomDirectoryVisibilitySwitch.isChecked()) // mRoomDirectoryVisibilitySwitch.setChecked(isRoomPublic); // } @@ -788,8 +788,8 @@ private void updatePreferenceUiValues() { // room guest access rules if ((null != mRoomAccessRulesListPreference) && (null != resources)) { - String joinRule = mRoom.getLiveState().join_rule; - String guestAccessRule = mRoom.getLiveState().getGuestAccess(); + String joinRule = mRoom.getState().join_rule; + String guestAccessRule = mRoom.getState().getGuestAccess(); if (RoomState.JOIN_RULE_INVITE.equals(joinRule)/* && RoomState.GUEST_ACCESS_CAN_JOIN.equals(guestAccessRule)*/) { // "Only people who have been invited" requires: {join_rule: "invite"} and {guest_access: "can_join"} @@ -867,7 +867,7 @@ private void updatePreferenceUiValues() { // room history readability if (null != mRoomHistoryReadabilityRulesListPreference) { - value = mRoom.getLiveState().getHistoryVisibility(); + value = mRoom.getState().getHistoryVisibility(); summary = null; if ((null != value) && (null != resources)) { @@ -952,7 +952,7 @@ private void onRoomHistoryReadabilityPreferenceChanged() { } // get new and previous values - String previousValue = mRoom.getLiveState().history_visibility; + String previousValue = mRoom.getState().history_visibility; String newValue = mRoomHistoryReadabilityRulesListPreference.getValue(); if (!TextUtils.equals(newValue, previousValue)) { @@ -1026,8 +1026,8 @@ private void onRoomAccessPreferenceChanged() { String guestAccessRuleToApply = null; // get new and previous values - String previousJoinRule = mRoom.getLiveState().join_rule; - String previousGuestAccessRule = mRoom.getLiveState().getGuestAccess(); + String previousJoinRule = mRoom.getState().join_rule; + String previousGuestAccessRule = mRoom.getState().getGuestAccess(); String newValue = mRoomAccessRulesListPreference.getValue(); if (ACCESS_RULES_ONLY_PEOPLE_INVITED.equals(newValue)) { @@ -1137,7 +1137,7 @@ private void onRoomNamePreferenceChanged() { } // get new and previous values - String previousName = mRoom.getLiveState().name; + String previousName = mRoom.getState().name; String newName = mRoomNameEditTxt.getText(); // update only, if values are different if (!TextUtils.equals(previousName, newName)) { @@ -1418,7 +1418,7 @@ public void onUnexpectedError(Exception e) { private boolean canUpdateFlair() { boolean canUpdateAliases = false; - PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + PowerLevels powerLevels = mRoom.getState().getPowerLevels(); if (null != powerLevels) { int powerLevel = powerLevels.getUserPowerLevel(mSession.getMyUserId()); @@ -1432,7 +1432,7 @@ private boolean canUpdateFlair() { * Refresh the flair list */ private void refreshFlair() { - final List groups = mRoom.getLiveState().getRelatedGroups(); + final List groups = mRoom.getState().getRelatedGroups(); Collections.sort(groups, String.CASE_INSENSITIVE_ORDER); mFlairSettingsCategory.removeAll(); @@ -1589,7 +1589,7 @@ private void onAddressLongClick(final String roomAlias, final View anchorView) { Menu menu = popup.getMenu(); ThemeUtils.INSTANCE.tintMenuIcons(menu, ThemeUtils.INSTANCE.getColor(context, R.attr.icon_tint_on_light_action_bar_color)); - String canonicalAlias = mRoom.getLiveState().alias; + String canonicalAlias = mRoom.getState().alias; boolean canUpdateAliases = canUpdateAliases(); menu.findItem(R.id.ic_action_vector_delete_alias).setVisible(canUpdateAliases); @@ -1670,7 +1670,7 @@ public void onUnexpectedError(Exception e) { private boolean canUpdateAliases() { boolean canUpdateAliases = false; - PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + PowerLevels powerLevels = mRoom.getState().getPowerLevels(); if (null != powerLevels) { int powerLevel = powerLevels.getUserPowerLevel(mSession.getMyUserId()); @@ -1685,7 +1685,7 @@ private boolean canUpdateAliases() { */ private void refreshAddresses() { final String localSuffix = ":" + mSession.getHomeServerConfig().getHomeserverUri().getHost(); - final String canonicalAlias = mRoom.getLiveState().alias; + final String canonicalAlias = mRoom.getState().alias; final List aliases = new ArrayList<>(mRoom.getAliases()); // remove the displayed preferences @@ -1897,7 +1897,7 @@ public void onSuccess(Void info) { isEncryptedPreference.setIcon(getResources().getDrawable(R.drawable.e2e_verified)); mAdvandceSettingsCategory.addPreference(isEncryptedPreference); } else { - PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels(); + PowerLevels powerLevels = mRoom.getState().getPowerLevels(); int myPowerLevel = -1; int minimumPowerLevel = 0; diff --git a/vector/src/main/java/im/vector/fragments/VectorSearchRoomFilesListFragment.java b/vector/src/main/java/im/vector/fragments/VectorSearchRoomFilesListFragment.java index 3601f83c7d..edd10ae8cb 100644 --- a/vector/src/main/java/im/vector/fragments/VectorSearchRoomFilesListFragment.java +++ b/vector/src/main/java/im/vector/fragments/VectorSearchRoomFilesListFragment.java @@ -87,7 +87,7 @@ public void cancelCatchingRequests() { mCanPaginateBack = true; if (null != mRoom) { mRoom.cancelRemoteHistoryRequest(); - mNextBatch = mRoom.getLiveState().getToken(); + mNextBatch = mRoom.getState().getToken(); } if (null != mSession) { mSession.getDataHandler().resetReplayAttackCheckInTimeline(mTimeLineId); @@ -127,7 +127,7 @@ public void startFilesSearch(final OnSearchResultListener onSearchResultListener @Override public void onSuccess(ArrayList eventsChunk) { List messageRows = new ArrayList<>(eventsChunk.size()); - RoomState liveState = mRoom.getLiveState(); + RoomState liveState = mRoom.getState(); for (Event event : eventsChunk) { messageRows.add(new MessageRow(event, liveState)); @@ -227,7 +227,7 @@ public void run() { mAdapter.setNotifyOnChange(false); for (Event event : eventChunks) { - MessageRow row = new MessageRow(event, mRoom.getLiveState()); + MessageRow row = new MessageRow(event, mRoom.getState()); mAdapter.insert(row, 0); } diff --git a/vector/src/main/java/im/vector/notifications/RoomsNotifications.java b/vector/src/main/java/im/vector/notifications/RoomsNotifications.java index 162ad4ca6a..5ff8efa518 100755 --- a/vector/src/main/java/im/vector/notifications/RoomsNotifications.java +++ b/vector/src/main/java/im/vector/notifications/RoomsNotifications.java @@ -150,7 +150,7 @@ public RoomsNotifications(NotifiedEvent anEventToNotify, mIsInvitationEvent = false; - EventDisplay eventDisplay = new RiotEventDisplay(mContext, mEvent, mRoom.getLiveState()); + EventDisplay eventDisplay = new RiotEventDisplay(mContext, mEvent, mRoom.getState()); eventDisplay.setPrependMessagesWithAuthor(true); CharSequence textualDisplay = eventDisplay.getTextualDisplay(); String body = !TextUtils.isEmpty(textualDisplay) ? textualDisplay.toString() : ""; @@ -219,7 +219,7 @@ private void initSingleRoom() { for (NotifiedEvent notifiedEvent : notifiedEvents) { Event event = store.getEvent(notifiedEvent.mEventId, notifiedEvent.mRoomId); - EventDisplay eventDisplay = new RiotEventDisplay(mContext, event, mRoom.getLiveState()); + EventDisplay eventDisplay = new RiotEventDisplay(mContext, event, mRoom.getState()); eventDisplay.setPrependMessagesWithAuthor(true); CharSequence textualDisplay = eventDisplay.getTextualDisplay(); @@ -244,7 +244,7 @@ private void initSingleRoom() { RoomMember member = mRoom.getMember(event.getSender()); roomNotifications.mSenderName = (null == member) ? event.getSender() : member.getName(); - EventDisplay eventDisplay = new RiotEventDisplay(mContext, event, mRoom.getLiveState()); + EventDisplay eventDisplay = new RiotEventDisplay(mContext, event, mRoom.getState()); eventDisplay.setPrependMessagesWithAuthor(false); CharSequence textualDisplay = eventDisplay.getTextualDisplay(); mQuickReplyBody = !TextUtils.isEmpty(textualDisplay) ? textualDisplay.toString() : ""; @@ -274,7 +274,7 @@ private void initMultiRooms() { String text; String header; - EventDisplay eventDisplay = new RiotEventDisplay(mContext, latestEvent, room.getLiveState()); + EventDisplay eventDisplay = new RiotEventDisplay(mContext, latestEvent, room.getState()); eventDisplay.setPrependMessagesWithAuthor(false); if (room.isInvited()) { @@ -282,10 +282,10 @@ private void initMultiRooms() { CharSequence textualDisplay = eventDisplay.getTextualDisplay(); text = !TextUtils.isEmpty(textualDisplay) ? textualDisplay.toString() : ""; } else if (1 == notifiedEvents.size()) { - eventDisplay = new RiotEventDisplay(mContext, latestEvent, room.getLiveState()); + eventDisplay = new RiotEventDisplay(mContext, latestEvent, room.getState()); eventDisplay.setPrependMessagesWithAuthor(false); - header = roomName + ": " + room.getLiveState().getMemberName(latestEvent.getSender()) + " "; + header = roomName + ": " + room.getState().getMemberName(latestEvent.getSender()) + " "; CharSequence textualDisplay = eventDisplay.getTextualDisplay(); @@ -340,10 +340,10 @@ private void initWearableMessage(Context context, Room room, Event latestEvent, MXSession session = Matrix.getInstance(context).getDefaultSession(); String roomName = getRoomName(context, session, room, null); - EventDisplay eventDisplay = new RiotEventDisplay(context, latestEvent, room.getLiveState()); + EventDisplay eventDisplay = new RiotEventDisplay(context, latestEvent, room.getState()); eventDisplay.setPrependMessagesWithAuthor(false); - mWearableMessage = roomName + ": " + room.getLiveState().getMemberName(latestEvent.getSender()) + " "; + mWearableMessage = roomName + ": " + room.getState().getMemberName(latestEvent.getSender()) + " "; CharSequence textualDisplay = eventDisplay.getTextualDisplay(); // the event might have been redacted diff --git a/vector/src/main/java/im/vector/services/EventStreamService.java b/vector/src/main/java/im/vector/services/EventStreamService.java index a9808c69cc..6214feede0 100755 --- a/vector/src/main/java/im/vector/services/EventStreamService.java +++ b/vector/src/main/java/im/vector/services/EventStreamService.java @@ -1358,7 +1358,7 @@ private NotifiedEvent getEventToNotify() { if (null != event) { // test if the message is displayable - EventDisplay eventDisplay = new RiotEventDisplay(getApplicationContext(), event, room.getLiveState()); + EventDisplay eventDisplay = new RiotEventDisplay(getApplicationContext(), event, room.getState()); eventDisplay.setPrependMessagesWithAuthor(false); CharSequence textualDisplay = eventDisplay.getTextualDisplay(); diff --git a/vector/src/main/java/im/vector/util/MatrixSdkExtensions.kt b/vector/src/main/java/im/vector/util/MatrixSdkExtensions.kt index dde5693674..05378ea557 100644 --- a/vector/src/main/java/im/vector/util/MatrixSdkExtensions.kt +++ b/vector/src/main/java/im/vector/util/MatrixSdkExtensions.kt @@ -48,7 +48,7 @@ fun Room?.getRoomMaxPowerLevel(): Int { var maxPowerLevel = 0 - liveState.powerLevels?.let { + state.powerLevels?.let { var tempPowerLevel: Int // find out the room member @@ -74,7 +74,7 @@ fun Room.isPowerLevelEnoughForAvatarUpdate(aSession: MXSession?): Boolean { var canUpdateAvatarWithCamera = false if (null != aSession) { - liveState.powerLevels?.let { + state.powerLevels?.let { val powerLevel = it.getUserPowerLevel(aSession.myUserId) // check the power level against avatar level diff --git a/vector/src/main/java/im/vector/util/SlashCommandsParser.java b/vector/src/main/java/im/vector/util/SlashCommandsParser.java index 77670498be..7f4409ced7 100755 --- a/vector/src/main/java/im/vector/util/SlashCommandsParser.java +++ b/vector/src/main/java/im/vector/util/SlashCommandsParser.java @@ -235,7 +235,7 @@ public void onMatrixError(final MatrixError e) { Collection rooms = session.getDataHandler().getStore().getRooms(); for (Room r : rooms) { - RoomState state = r.getLiveState(); + RoomState state = r.getState(); if (null != state) { if (TextUtils.equals(state.alias, roomAlias)) { diff --git a/vector/src/main/java/im/vector/util/VectorUtils.java b/vector/src/main/java/im/vector/util/VectorUtils.java index bda3c3fb12..5fa7b3c59d 100755 --- a/vector/src/main/java/im/vector/util/VectorUtils.java +++ b/vector/src/main/java/im/vector/util/VectorUtils.java @@ -175,9 +175,9 @@ public static String getCallingRoomDisplayName(Context context, MXSession sessio List roomMembersList = new ArrayList<>(roomMembers); if (TextUtils.equals(roomMembersList.get(0).getUserId(), session.getMyUserId())) { - return room.getLiveState().getMemberName(roomMembersList.get(1).getUserId()); + return room.getState().getMemberName(roomMembersList.get(1).getUserId()); } else { - return room.getLiveState().getMemberName(roomMembersList.get(0).getUserId()); + return room.getState().getMemberName(roomMembersList.get(0).getUserId()); } } else { return getRoomDisplayName(context, session, room); @@ -204,7 +204,7 @@ public static String getRoomDisplayName(Context context, MXSession session, Room // https://github.com/matrix-org/matrix-js-sdk/blob/develop/lib/models/room.js#L617 // calculateRoomName(room, userId) - RoomState roomState = room.getLiveState(); + RoomState roomState = room.getState(); if (!TextUtils.isEmpty(roomState.name)) { return roomState.name; diff --git a/vector/src/main/java/im/vector/widgets/WidgetsManager.java b/vector/src/main/java/im/vector/widgets/WidgetsManager.java index dceb3cddc4..4ebddb458e 100755 --- a/vector/src/main/java/im/vector/widgets/WidgetsManager.java +++ b/vector/src/main/java/im/vector/widgets/WidgetsManager.java @@ -128,7 +128,7 @@ public List getActiveWidgets(MXSession session, Room room) { */ private List getActiveWidgets(final MXSession session, final Room room, final Set widgetTypes, final Set excludedTypes) { // Get all im.vector.modular.widgets state events in the room - List widgetEvents = room.getLiveState().getStateEvents(new HashSet<>(Arrays.asList(WIDGET_EVENT_TYPE))); + List widgetEvents = room.getState().getStateEvents(new HashSet<>(Arrays.asList(WIDGET_EVENT_TYPE))); // Widget id -> widget Map widgets = new HashMap<>(); @@ -238,10 +238,10 @@ public List getActiveWebviewWidgets(final MXSession session, final Room public WidgetError checkWidgetPermission(MXSession session, Room room) { WidgetError error = null; - if ((null != room) && (null != room.getLiveState()) && (null != room.getLiveState().getPowerLevels())) { - int oneSelfPowerLevel = room.getLiveState().getPowerLevels().getUserPowerLevel(session.getMyUserId()); + if ((null != room) && (null != room.getState()) && (null != room.getState().getPowerLevels())) { + int oneSelfPowerLevel = room.getState().getPowerLevels().getUserPowerLevel(session.getMyUserId()); - if (oneSelfPowerLevel < room.getLiveState().getPowerLevels().state_default) { + if (oneSelfPowerLevel < room.getState().getPowerLevels().state_default) { error = new WidgetError(WidgetError.WIDGET_NOT_ENOUGH_POWER_ERROR_CODE, VectorApp.getInstance().getString(R.string.widget_no_power_to_manage)); } } From fdc8237d98e01963b9b4f320944d6d81137b90f0 Mon Sep 17 00:00:00 2001 From: Audrey OLIVIER Date: Mon, 16 Jul 2018 17:56:25 +0200 Subject: [PATCH 2/3] Add description in CHANGES file --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 9e5cad1b47..1936d01cb0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,6 +10,7 @@ Improvements: Other changes: - Remove dependency to `android-gif-drawable` lib and use Glide to animate logo on Splashscreen (#2421) + - Keep only Room.getState() method and remove Room.getLiveState() because they are similar (#310) Bugfix: - Fix issue on incoming call screen when "Do not disturb mode" is active (#2417) From 13eca5987d8c8d954404a028b490eff99474f22a Mon Sep 17 00:00:00 2001 From: Audrey OLIVIER Date: Mon, 16 Jul 2018 18:19:21 +0200 Subject: [PATCH 3/3] Updating after review --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1936d01cb0..86d141b7de 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,7 +10,7 @@ Improvements: Other changes: - Remove dependency to `android-gif-drawable` lib and use Glide to animate logo on Splashscreen (#2421) - - Keep only Room.getState() method and remove Room.getLiveState() because they are similar (#310) + - Keep only Room.getState() method and remove Room.getLiveState() because they are similar (matrix-org/matrix-android-sdk#310) Bugfix: - Fix issue on incoming call screen when "Do not disturb mode" is active (#2417)