gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-12-09 20:37:29 +01:00
parent fdaa69f489
commit 8aee1afa2b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -549,8 +549,8 @@ public class CallActivity extends AppCompatActivity {
Set<String> oldSesssions = new HashSet<>(); Set<String> oldSesssions = new HashSet<>();
for (HashMap<String, String> participant : users) { for (HashMap<String, String> participant : users) {
Object inCallObject = participant.get("inCall");
if (!participant.get("sessionId").equals(callSession)) { if (!participant.get("sessionId").equals(callSession)) {
Object inCallObject = participant.get("inCall");
if ((boolean) inCallObject) { if ((boolean) inCallObject) {
newSessions.add(participant.get("sessionId")); newSessions.add(participant.get("sessionId"));
} else { } else {

8
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -381,12 +381,16 @@ public class SettingsController extends BaseController {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation); super.onAnimationEnd(animation);
messageView.setVisibility(View.GONE); if (messageView != null) {
messageView.setVisibility(View.GONE);
}
} }
}); });
} else { } else {
messageView.setVisibility(View.GONE); if (messageView != null) {
messageView.setVisibility(View.GONE);
}
} }
} }