Issue 2620

Jenkinsfile

@@ -22,7 +22,6 @@ def buildRC() {
 def publishRCResults() {
     junit testResults: '**/target/surefire-reports/*.xml', testDataPublishers: [[$class: 'StabilityTestDataPublisher']]
     checkstyle canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/checkstyle-result.xml', unHealthy: ''
-    junit '**/target/surefire-reports/*.xml'
     step( [ $class: 'JacocoPublisher' ] )
     if ((env.BRANCH_NAME == 'master') && (currentBuild.currentResult != 'SUCCESS') ) {
        slackSend "Build unstable - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"

README.md

@@ -21,7 +21,7 @@ Downloads
 ========
 
 Use [the Docker image](http://documentation.telestax.com/connect/configuration/docker/Restcomm%20-%20Docker%20Quick%20Start%20Guide.html#restcomm-docker/). It only takes a few minutes to set it up and running.
-Alternatively, you can download the [Binary zip](https://github.com/RestComm/Restcomm-Connect/releases/latest) as well
+Alternatively, you can download the [Binary zip](https://www.restcomm.com/downloads/) as well
 
 Documentation
 ========

restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/sdks/restcomm-client-android-sdk-quick-start.adoc

@@ -22,12 +22,12 @@ Here you have three alternativess:
 
 Once you have installed the Restcomm platform (or you are using Cloud) you are ready to start taking advantage of Restcomm's features from your Android Applications. Here's what you need to do:
 
-* Grab the latest Restcomm WebRTC Android SDK release from GitHub: https://github.com/RestComm/restcomm-android-sdk/releases/tag/v1.0.5-BETA7. At the time of this writing it is v1.0.5-beta7 and the bundle you need to download is restcomm-android-sdk-1.0.5-beta7.tar.bz2
+* Grab the latest Restcomm WebRTC Android SDK release from GitHub: https://github.com/RestComm/restcomm-android-sdk/releases/tag/v1.0.6-BETA8. At the time of this writing it is v1.0.6-beta8 and the bundle you need to download is restcomm-android-sdk-1.0.6-beta8.tar.bz2
 * Extract it:
 +
 [source,theme:github,toolbar:2,lang:default,decode:true]
 ----
-$ tar -jxvf restcomm-android-sdk-1.0.0-beta7.tar.bz2
+$ tar -jxvf restcomm-android-sdk-1.0.6-beta8.tar.bz2
 ----
 
 [[use-the-existing-sample-androidapp-helloworld]]
@@ -152,12 +152,24 @@ public class MainActivity extends Activity implements RCDeviceListener, RCConnec
 [source,java,theme:github,toolbar:1,lang:default,decode:true]
 ----
 // RCDevice Listeners
-public void onStartListening(RCDevice device, RCDeviceListener.RCConnectivityStatus connectivityStatus)
+public void onInitialized(RCDevice device, RCDeviceListener.RCConnectivityStatus connectivityStatus, int statusCode, String statusText){
+
+}
+
+public void onReconfigured(RCDevice device, RCConnectivityStatus connectivityStatus, int statusCode, String statusText)
 {
 
 }
 
-public void onStopListening(RCDevice device, int errorCode, String errorText)
+public void onReleased(RCDevice device, int statusCode, String statusText){
+
+}
+
+public void onMessageSent(RCDevice device, int statusCode, String statusText, String jobId){
+
+}
+
+public void onError(RCDevice device, int statusCode, String statusText)
 {
    Log.i(TAG, errorText);
 }
@@ -182,26 +194,12 @@ public void onDisconnected(RCConnection connection)
    pendingConnection = null;
 }
 
-public void onDisconnected(RCConnection connection, int errorCode, String errorText)
-{
-
-   Log.i(TAG, errorText);
-   this.connection = null;
-   pendingConnection = null;
-}
-
-public void onCancelled(RCConnection connection)
+public void onDigitSent(RCConnection connection, int statusCode, String statusText)
 {
-   Log.i(TAG, "RCConnection cancelled");
-   this.connection = null;
-   pendingConnection = null;
 }
 
-public void onDeclined(RCConnection connection)
-{
-   Log.i(TAG, "RCConnection declined");
-   this.connection = null;
-   pendingConnection = null;
+public void onError(RCConnection connection, int errorCode, String errorText){
+    Log.i(TAG, errorText);
 }
 
 public void onLocalVideo(RCConnection connection)
@@ -212,29 +210,6 @@ public void onRemoteVideo(RCConnection connection)
 {
 }
 
-public void onError(RCConnection connection, int errorCode, String errorText)
-{
-}
-
-public void onDigitSent(RCConnection connection, int statusCode, String statusText)
-{
-}
-
-public void onMessageSent(RCDevice device, int statusCode, String statusText)
-{
-}
-
-public void onReleased(RCDevice device, int statusCode, String statusText)
-{
-}
-
-public void onInitialized(RCDevice device, RCDeviceListener.RCConnectivityStatus connectivityStatus, int statusCode, String statusText)
-{
-}
-
-public void onInitializationError(int errorCode, String errorText)
-{
-}
 ----
 * Add the needed Android SDK objects (i.e. RCDevice and RCConnection) in the Activity class as well as some convenience variables:
 +
@@ -300,17 +275,24 @@ public void onServiceConnected(ComponentName className, IBinder service)
    params.put(RCDevice.ParameterKeys.SIGNALING_USERNAME, "android-sdk");
    params.put(RCDevice.ParameterKeys.SIGNALING_PASSWORD, "1234");
    params.put(RCDevice.ParameterKeys.MEDIA_ICE_URL, "https://service.xirsys.com/ice");
+   params.put(RCDevice.ParameterKeys.MEDIA_ICE_DOMAIN, "cloud.restcomm.com");
    params.put(RCDevice.ParameterKeys.MEDIA_ICE_USERNAME, "atsakiridis");
    params.put(RCDevice.ParameterKeys.MEDIA_ICE_PASSWORD, "4e89a09e-bf6f-11e5-a15c-69ffdcc2b8a7");
    params.put(RCDevice.ParameterKeys.MEDIA_TURN_ENABLED, true);
+   params.put(RCDevice.ParameterKeys.MEDIA_ICE_SERVERS_DISCOVERY_TYPE,1);
    //params.put(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED, prefs.getBoolean(RCDevice.ParameterKeys.SIGNALING_SECURE_ENABLED, false));
 
-   if (!device.isInitialized()) {
-      device.initialize(getApplicationContext(), params, this);
-      device.setLogLevel(Log.VERBOSE);
-   }
+    if (!device.isInitialized()) {
+         try {
+            device.initialize(getApplicationContext(), params, this);
+            device.setLogLevel(Log.VERBOSE);
+         }
+         catch (RCException e) {
+            Log.e(TAG, "RCDevice Initialization Error: " + e.errorText);
+         }
+    }
 
-   serviceBound = true;
+    serviceBound = true;
 }
 
 @Override

restcomm/restcomm.extension.controller/src/main/java/org/restcomm/connect/extension/controller/ExtensionController.java

@@ -39,6 +39,14 @@ public static ExtensionController getInstance() {
         return instance;
     }
 
+    /**
+     * allow to reset the singleton. Mainly for testing purposes.
+     * TODO should we reset the singleton if app is shutdown...?
+     */
+    public void reset() {
+        instance = null;
+    }
+
     public List<RestcommExtensionGeneric> getExtensions(final ExtensionType type) {
         //Check the sender's class and return the extensions that are supported for this class
         if (type.equals(ExtensionType.CallManager) && (callManagerExtensions != null && callManagerExtensions.size() > 0)) {

restcomm/restcomm.extension.controller/src/test/java/org.restcomm.connect.extension.controller/ExtensionsControllerTest.java

@@ -33,13 +33,22 @@
 
 import javax.servlet.ServletContext;
 import java.util.List;
+import org.junit.After;
 
 public class ExtensionsControllerTest {
 
     private static Logger logger = Logger.getLogger(ExtensionsControllerTest.class);
 
     private RestcommExtensionGeneric testExtension = new TestExtension();
 
+
+    @After
+    public void resteController() {
+        //reset the singleton after each test to provide isolation and
+        //predictibiltiy when full test class is executed
+        ExtensionController.getInstance().reset();
+    }
+
     @Test
     public void extensionRegistry() {
         ExtensionController extensionController = ExtensionController.getInstance();

restcomm/restcomm.ui/src/main/webapp/index.html

@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta charset="utf-8">
+        <meta http-equiv="expires" content="0">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>RestComm</title>
 
         <link rel="icon" type="image/png" href="resources/img/favicon.png">

restcomm/restcomm.ui/src/main/webapp/modules/application-templates.html

@@ -2,7 +2,7 @@
 
     <div class="row templates-head">
         <div class="col-lg-3 col-md-12">
-            <h2 class="templates-title">Template Galery</h2>
+            <h2 class="templates-title">Template Gallery</h2>
         </div>
         <div class="col-lg-5 col-md-6 col-sm-12 template-tags">
             <div class="row">
@@ -34,4 +34,5 @@ <h2 class="templates-title">Template Galery</h2>
         </div>
     </div>
 
-</div>
+</div>
+

restcomm/restcomm.ui/src/main/webapp/modules/logs-calls.html

@@ -155,7 +155,7 @@ <h5>Call your friends!</h5>
                             </form>
                         </div>
                         <div class="col-md-4">
-                            <uib-pagination class="pagination pagination-sm pull-right" ng-change="pageChanged()" total-items="totalCalls" items-per-page="entryLimit" ng-model="currentPage" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></uib-pagination>
+                            <ul uib-pagination class="pagination pagination-sm pull-right" ng-change="pageChanged()" total-items="totalCalls" items-per-page="entryLimit" ng-model="currentPage" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></ul>
                         </div>
                     </div>
                 </td>

restcomm/restcomm.ui/src/main/webapp/modules/logs-messages.html

@@ -127,7 +127,7 @@ <h5>Text your friends!</h5>
                                 </form>
                                 </div>
                                 <div class="col-md-4">
-                                  <uib-pagination class="pagination pagination-sm pull-right" total-items="totalMessages" items-per-page="entryLimit" ng-change="pageChanged()" ng-model="currentPage" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></uib-pagination>
+                                  <ul uib-pagination class="pagination pagination-sm pull-right" total-items="totalMessages" items-per-page="entryLimit" ng-change="pageChanged()" ng-model="currentPage" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></ul>
                                 </div>
                             </div>
                         </td>

restcomm/restcomm.ui/src/main/webapp/modules/logs-notifications.html

@@ -125,7 +125,7 @@ <h5>You must be doing it right!</h5>
                                 </form>
                             </div>
                             <div class="col-md-4">
-                                <uib-pagination class="pagination pagination-sm pull-right" total-items="totalNotifications" items-per-page="entryLimit" ng-model="currentPage" ng-change="pageChanged()" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></uib-pagination>
+                                <ul uib-pagination class="pagination pagination-sm pull-right" total-items="totalNotifications" items-per-page="entryLimit" ng-model="currentPage" ng-change="pageChanged()" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></ul>
                             </div>
                         </div>
                     </td>

restcomm/restcomm.ui/src/main/webapp/modules/logs-recordings.html

@@ -112,7 +112,7 @@ <h5>Ask the NSA for some!</h5>
                                 </form>
                             </div>
                             <div class="col-md-4">
-                                <uib-pagination class="pagination pagination-sm pull-right" total-items="totalRecordings" items-per-page="entryLimit" ng-model="currentPage" ng-change="pageChanged()" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></uib-pagination>
+                                <ul uib-pagination class="pagination pagination-sm pull-right" total-items="totalRecordings" items-per-page="entryLimit" ng-model="currentPage" ng-change="pageChanged()" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></ul>
                             </div>
                         </div>
                     </td>

restcomm/restcomm.ui/src/main/webapp/modules/logs-transcriptions.html

@@ -117,7 +117,7 @@ <h5>Confirm there's paper in the tray!</h5>
                                 </form>
                             </div>
                             <div class="col-md-4">
-                                <uib-pagination class="pagination pagination-sm pull-right" total-items="totalTranscriptions" items-per-page="entryLimit" ng-model="currentPage" ng-change="pageChanged()" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></uib-pagination>
+                                <ul uib-pagination class="pagination pagination-sm pull-right" total-items="totalTranscriptions" items-per-page="entryLimit" ng-model="currentPage" ng-change="pageChanged()" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></ul>
                             </div>
                         </div>
                     </td>

restcomm/restcomm.ui/src/main/webapp/modules/numbers-incoming.html

@@ -82,7 +82,7 @@ <h5><i class="fa fa-pencil clickable" ng-click="editingFriendlyName = pn.phone_n
                             </form>
                         </div>
                         <div class="col-md-4">
-                            <uib-pagination class="pagination pagination-sm pull-right" ng-change="pageChanged()" total-items="totalNumbers" items-per-page="entryLimit" ng-model="currentPage" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></uib-pagination>
+                            <ul uib-pagination class="pagination pagination-sm pull-right" ng-change="pageChanged()" total-items="totalNumbers" items-per-page="entryLimit" ng-model="currentPage" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></ul>
                         </div>
                     </div>
                 </td>

restcomm/restcomm.ui/src/main/webapp/modules/subaccounts.html

@@ -74,7 +74,7 @@ <h5>Why don't you get some friends in?</h5>
                         </form>
                     </div>
                     <div class="col-md-4">
-                        <uib-pagination class="pagination pagination-sm pull-right" ng-change="pageChanged()" total-items="filtered.length" items-per-page="entryLimit" ng-model="currentPage" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></uib-pagination>
+                        <ul uib-pagination class="pagination pagination-sm pull-right" ng-change="pageChanged()" total-items="filtered.length" items-per-page="entryLimit" ng-model="currentPage" data-boundary-links="true" data-current-page="currentPage" max-size="maxSize" previous-text="<" next-text=">" first-text="<<" last-text=">>"></ul>
                     </div>
                 </div>
             </td>