Fixed #533: SIP User Agent shows up wrong in logs

Author: Antonis

Examples/restcomm-olympus/app/build.gradle

@@ -50,25 +50,27 @@ android {
             logger.info("Using versionName: " + VERSION_NAME)
             versionName VERSION_NAME
         }
-        else {
-            versionName "1.0.0-BETA4"
-        }
 
         //buildConfigField "boolean", "DISABLE_SOMETHING", "true"
 
-        // ICE_USERNAME & ICE_PASSWORD should remain secret and hence are defined in global properties (i.e. only available to project members)
+        // ICE_USERNAME & ICE_PASSWORD are defined in project gradle.properties, but also overriden in global gradle.properties
+        // which exists *only* in Telestax builds. Reason for this is that Telestax builds use different settings
+        // for ICE that are meant for production systems, and which should remain secret (remember that the global gradle.properties
+        // isn't part of the repo)
         if (project.hasProperty('ICE_USERNAME') && project.hasProperty('ICE_PASSWORD') && project.hasProperty('ICE_DOMAIN')) {
             // Add them as resource values which are available in preferences.xml
             resValue "string", "ICE_USERNAME", ICE_USERNAME
             resValue "string", "ICE_PASSWORD", ICE_PASSWORD
             resValue "string", "ICE_DOMAIN", ICE_DOMAIN
         }
+        /*
         else {
             // Let's use my personal free xirsys account credentials for community, so that STUN/TURN works out of the box and eases adoption
             resValue "string", "ICE_USERNAME", "atsakiridis"
             resValue "string", "ICE_PASSWORD", "4e89a09e-bf6f-11e5-a15c-69ffdcc2b8a7"
             resValue "string", "ICE_DOMAIN", "cloud.restcomm.com"
         }
+        */
 
         //multiDexEnabled true
         //manifestPlaceholders = [HOCKEYAPP_APP_ID: "9f94a735a6f6431ba368e6e0581067a4"]

Examples/restcomm-olympus/gradle.properties

@@ -19,3 +19,8 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 LIBRARY_GROUP = "org.restcomm"
 LIBRARY_ARTIFACT_ID = "restcomm-android-sdk"
 LIBRARY_VERSION = "1.0.0"
+
+# Let's use my personal free xirsys account credentials for community, so that STUN/TURN works out of the box and eases adoption
+ICE_USERNAME = "atsakiridis"
+ICE_PASSWORD = "4e89a09e-bf6f-11e5-a15c-69ffdcc2b8a7"
+ICE_DOMAIN = "cloud.restcomm.com"

restcomm.android.sdk/build.gradle

@@ -24,8 +24,22 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 1629
-        versionName "1.0.0-BETA4"
+
+        if (project.hasProperty('VERSION_CODE')) {
+            logger.info("Using versionCode: " + VERSION_CODE)
+            versionCode VERSION_CODE.toInteger()
+        }
+        else {
+            logger.info("Doesn't have VERSION_CODE, falling back to: 1")
+            versionCode 1
+        }
+
+        if (project.hasProperty('VERSION_NAME')) {
+            logger.info("Using versionName: " + VERSION_NAME)
+            versionName VERSION_NAME
+        }
+        //versionCode 1629
+        //versionName "1.0.0-BETA4"
     }
     buildTypes {
         release {