narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

minor code clean up

Browse source
This commit is contained in:
Daniel Gultsch 2022-06-22 07:56:44 +02:00
parent 17b9ca9dec
commit 42bd8e6d61
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -145,7 +145,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
return; return;
} }
xmppConnectionService.getNotificationService().setIsInForeground(true); xmppConnectionService.getNotificationService().setIsInForeground(true);
Intent intent = pendingViewIntent.pop(); final Intent intent = pendingViewIntent.pop();
if (intent != null) { if (intent != null) {
if (processViewIntent(intent)) { if (processViewIntent(intent)) {
if (binding.secondaryFragment != null) { if (binding.secondaryFragment != null) {
@ -159,7 +159,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
notifyFragmentOfBackendConnected(id); notifyFragmentOfBackendConnected(id);
} }
ActivityResult activityResult = postponedActivityResult.pop(); final ActivityResult activityResult = postponedActivityResult.pop();
if (activityResult != null) { if (activityResult != null) {
handleActivityResult(activityResult); handleActivityResult(activityResult);
} }

4
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
View file

@ -569,9 +569,9 @@ public class JingleConnectionManager extends AbstractConnectionManager {
} }
} }
synchronized (this.rtpSessionProposals) { synchronized (this.rtpSessionProposals) {
for (Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry : for (final Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry :
this.rtpSessionProposals.entrySet()) { this.rtpSessionProposals.entrySet()) {
RtpSessionProposal proposal = entry.getKey(); final RtpSessionProposal proposal = entry.getKey();
if (proposal.account == contact.getAccount() if (proposal.account == contact.getAccount()
&& contact.getJid().asBareJid().equals(proposal.with)) { && contact.getJid().asBareJid().equals(proposal.with)) {
final DeviceDiscoveryState preexistingState = entry.getValue(); final DeviceDiscoveryState preexistingState = entry.getValue();