From d86e5f50b09a7d9a271d4d335132f4fd7a4a3788 Mon Sep 17 00:00:00 2001 From: Andrew Comminos Date: Thu, 5 Jan 2017 20:05:43 -0800 Subject: Check service connectivity before fetching model information when updating target information. --- app/build.gradle | 2 +- .../main/java/com/morlunk/mumbleclient/channel/ChannelFragment.java | 6 ++++-- libraries/Jumble | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0e03996..5986512 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,7 +20,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.2.3' } } apply plugin: 'com.android.application' diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelFragment.java b/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelFragment.java index 1b007c3..d50b223 100644 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelFragment.java +++ b/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelFragment.java @@ -246,8 +246,10 @@ public class ChannelFragment extends JumbleServiceFragment implements SharedPref @Override public void onServiceBound(IJumbleService service) { super.onServiceBound(service); - configureTargetPanel(); - configureInput(); + if (service.getConnectionState() == JumbleService.ConnectionState.CONNECTED) { + configureTargetPanel(); + configureInput(); + } } private void configureTargetPanel() { diff --git a/libraries/Jumble b/libraries/Jumble index 9933c8a..8e66e01 160000 --- a/libraries/Jumble +++ b/libraries/Jumble @@ -1 +1 @@ -Subproject commit 9933c8a0caa2bbd1a8fb28ab4c985bde73a76843 +Subproject commit 8e66e010efc773336be72fee8dc1640ee8a13ece -- cgit v1.2.3