Replace LooperExecutor with built-in class in Android AppRTC Demo

webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 package org.appspot.apprtc;
 
 import org.appspot.apprtc.AppRTCClient.RoomConnectionParameters;
 import org.appspot.apprtc.AppRTCClient.SignalingParameters;
 import org.appspot.apprtc.PeerConnectionClient.PeerConnectionParameters;
-import org.appspot.apprtc.util.LooperExecutor;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.FragmentTransaction;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager.LayoutParams;
 import android.widget.Toast;
 
+import org.appspot.apprtc.util.LooperExecutor;

[magjed_webrtc, 2016/05/19 12:07:54]

Move this import back to the other org.appspot.apprtc imports.

[sakal, 2016/05/19 12:39:03]

Done.

 import org.webrtc.EglBase;
 import org.webrtc.IceCandidate;
 import org.webrtc.PeerConnectionFactory;
 import org.webrtc.SessionDescription;
 import org.webrtc.StatsReport;
 import org.webrtc.RendererCommon.ScalingType;
 import org.webrtc.SurfaceViewRenderer;
 
+import java.util.concurrent.Executors;

[magjed_webrtc, 2016/05/19 12:07:54]

not used?

[sakal, 2016/05/19 12:39:03]

Done.

+
 /**
  * Activity for peer connection call setup, call waiting
  * and call view.
  */
 public class CallActivity extends Activity
     implements AppRTCClient.SignalingEvents,
       PeerConnectionClient.PeerConnectionEvents,
       CallFragment.OnCallEvents {
 
   public static final String EXTRA_ROOMID =
@@ skipping 187 matching lines @@
         intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false));
     commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false);
     runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0);
 
     // Create connection client. Use DirectRTCClient if room name is an IP otherwise use the
     // standard WebSocketRTCClient.
     if (loopback || !DirectRTCClient.IP_PATTERN.matcher(roomId).matches()) {
       appRtcClient = new WebSocketRTCClient(this, new LooperExecutor());
     } else {
       Log.i(TAG, "Using DirectRTCClient because room name looks like an IP.");
-      appRtcClient = new DirectRTCClient(this, new LooperExecutor());
+      appRtcClient = new DirectRTCClient(this);
     }
     // Create connection parameters.
     roomConnectionParameters = new RoomConnectionParameters(
         roomUri.toString(), roomId, loopback);
 
     // Create CPU monitor
     cpuMonitor = new CpuMonitor(this);
     hudFragment.setCpuMonitor(cpuMonitor);
 
     // Send intent arguments to fragments.
@@ skipping 48 matching lines @@
   }
 
   @Override
   protected void onDestroy() {
     disconnect();
     if (logToast != null) {
       logToast.cancel();
     }
     activityRunning = false;
     rootEglBase.release();
-    if (cpuMonitor != null) {
-      cpuMonitor.release();

[magjed_webrtc, 2016/05/19 12:07:54]

don't we need to shut down the ExecutorService?

[sakal, 2016/05/19 12:39:03]

In the new implementation, the executor is already destroyed on onPause.

-    }
     super.onDestroy();
   }
 
   // CallFragment.OnCallEvents interface implementation.
   @Override
   public void onCallHangUp() {
     disconnect();
   }
 
   @Override
@@ skipping 378 matching lines @@
         }
       }
     });
   }
 
   @Override
   public void onPeerConnectionError(final String description) {
     reportError(description);
   }
 }