forked from mirror/monocles_chat_clean
minor code clean up (Daniel Gultsch)
This commit is contained in:
parent
504a074a14
commit
2d07c88c50
2 changed files with 4 additions and 4 deletions
|
@ -192,7 +192,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
|
|||
Log.d(Config.LOGTAG, "Device is running Android < SDK 23, no restart required: " + FirstStartTime);
|
||||
}
|
||||
|
||||
Intent intent = pendingViewIntent.pop();
|
||||
final Intent intent = pendingViewIntent.pop();
|
||||
if (intent != null) {
|
||||
if (processViewIntent(intent)) {
|
||||
if (binding.secondaryFragment != null) {
|
||||
|
@ -237,7 +237,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
|
|||
notifyFragmentOfBackendConnected(id);
|
||||
}
|
||||
|
||||
ActivityResult activityResult = postponedActivityResult.pop();
|
||||
final ActivityResult activityResult = postponedActivityResult.pop();
|
||||
if (activityResult != null) {
|
||||
handleActivityResult(activityResult);
|
||||
}
|
||||
|
|
|
@ -569,9 +569,9 @@ public class JingleConnectionManager extends AbstractConnectionManager {
|
|||
}
|
||||
}
|
||||
synchronized (this.rtpSessionProposals) {
|
||||
for (Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry :
|
||||
for (final Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry :
|
||||
this.rtpSessionProposals.entrySet()) {
|
||||
RtpSessionProposal proposal = entry.getKey();
|
||||
final RtpSessionProposal proposal = entry.getKey();
|
||||
if (proposal.account == contact.getAccount()
|
||||
&& contact.getJid().asBareJid().equals(proposal.with)) {
|
||||
final DeviceDiscoveryState preexistingState = entry.getValue();
|
||||
|
|
Loading…
Add table
Reference in a new issue