Merge pull request #836 from ognjenns/master

Working on #811: fixed (moved logic inside broadcast receiver)

Author: Antonis Tsakiridis

Examples/restcomm-olympus/app/src/main/java/org/restcomm/android/olympus/MainActivity.java

@@ -265,7 +265,6 @@ public void onServiceConnected(ComponentName className, IBinder service)
          }
       }
       else {
-         if (device.isInitialized()) {
             device.setDeviceListener(this);
             RCConnection connection = device.getLiveConnection();
             if (connection != null) {
@@ -274,7 +273,6 @@ public void onServiceConnected(ComponentName className, IBinder service)
                lblOngoingCall.setVisibility(View.VISIBLE);
                startTimer();
             }
-         }
       }
 
 

restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/MediaClient/AppRTCAudioManager.java

@@ -230,6 +230,8 @@ public void run()
          }
       });
 
+      updateAudioDeviceState(hasWiredHeadset());
+
       // Store current audio state so we can restore it when close() is called.
       savedAudioMode = audioManager.getMode();
       savedIsSpeakerPhoneOn = audioManager.isSpeakerphoneOn();
@@ -251,7 +253,6 @@ public void run()
       // Do initial selection of audio device. This setting can later be changed
       // either by adding/removing a wired headset or by covering/uncovering the
       // proximity sensor.
-      updateAudioDeviceState(hasWiredHeadset());
 
       // Register receiver for broadcast intents related to adding/removing a
       // wired headset (Intent.ACTION_HEADSET_PLUG).
@@ -414,15 +415,12 @@ public void onReceive(Context context, Intent intent)
                   + ", n=" + name
                   + ", sb=" + isInitialStickyBroadcast());
 
-            boolean hasWiredHeadset = (state == STATE_PLUGGED) ? true : false;
             switch (state) {
                case STATE_UNPLUGGED:
-                  updateAudioDeviceState(hasWiredHeadset);
+                  updateAudioDeviceState(false);
                   break;
                case STATE_PLUGGED:
-                  if (selectedAudioDevice != AudioDevice.WIRED_HEADSET) {
-                     updateAudioDeviceState(hasWiredHeadset);
-                  }
+                  updateAudioDeviceState(true);
                   break;
                default:
                   RCLogger.e(TAG, "Invalid state");

restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCConnection.java

@@ -1973,6 +1973,7 @@ public void run()
       mainHandler.post(myRunnable);
    }
 
+   @SuppressWarnings("unchecked")
    @Override
    public void onIceConnected()
    {

restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCDevice.java

@@ -697,14 +697,11 @@ public void run() {
          else {
             throw new RCException(RCClient.ErrorCodes.ERROR_DEVICE_ALREADY_INITIALIZED);
          }
-
+         return false;
       }catch (RCException e){
          isServiceInitialized = false;
          throw e;
-      } finally {
-         return true;
       }
-
    }
 
    /**