Merge branch 'master' of https://github.com/RestComm/restcomm-android…

…-sdk # Conflicts: # Examples/restcomm-olympus/app/app.iml
RestComm · Jan 29, 2018 · eba2ae3 · eba2ae3
2 parents 7c4c897 + 0211523
commit eba2ae3
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 105 deletions.
diff --git a/Examples/restcomm-olympus/app/app.iml b/Examples/restcomm-olympus/app/app.iml
diff --git a/Examples/restcomm-olympus/app/build.gradle b/Examples/restcomm-olympus/app/build.gradle
@@ -67,6 +67,7 @@ android {
             // Not specifying applicationIdSuffix since release uses the default applicationId: org.restcomm.android.olympus
             buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "true"
             buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
+            buildConfigField "String", "TEST_PUSH_FCM_KEY", TEST_PUSH_FCM_KEY
 
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

diff --git a/...s/restcomm-olympus/app/src/communityDebug/res/mipmap-hdpi/ic_launcher_final.png b/...s/restcomm-olympus/app/src/communityDebug/res/mipmap-hdpi/ic_launcher_final.png
diff --git a/...s/restcomm-olympus/app/src/communityDebug/res/mipmap-mdpi/ic_launcher_final.png b/...s/restcomm-olympus/app/src/communityDebug/res/mipmap-mdpi/ic_launcher_final.png
diff --git a/.../restcomm-olympus/app/src/communityDebug/res/mipmap-xhdpi/ic_launcher_final.png b/.../restcomm-olympus/app/src/communityDebug/res/mipmap-xhdpi/ic_launcher_final.png
diff --git a/...restcomm-olympus/app/src/communityDebug/res/mipmap-xxhdpi/ic_launcher_final.png b/...restcomm-olympus/app/src/communityDebug/res/mipmap-xxhdpi/ic_launcher_final.png
diff --git a/...estcomm-olympus/app/src/communityDebug/res/mipmap-xxxhdpi/ic_launcher_final.png b/...estcomm-olympus/app/src/communityDebug/res/mipmap-xxxhdpi/ic_launcher_final.png
diff --git a/...restcomm-olympus/app/src/communityRelease/res/mipmap-hdpi/ic_launcher_final.png b/...restcomm-olympus/app/src/communityRelease/res/mipmap-hdpi/ic_launcher_final.png
diff --git a/...restcomm-olympus/app/src/communityRelease/res/mipmap-mdpi/ic_launcher_final.png b/...restcomm-olympus/app/src/communityRelease/res/mipmap-mdpi/ic_launcher_final.png
diff --git a/...estcomm-olympus/app/src/communityRelease/res/mipmap-xhdpi/ic_launcher_final.png b/...estcomm-olympus/app/src/communityRelease/res/mipmap-xhdpi/ic_launcher_final.png
diff --git a/...stcomm-olympus/app/src/communityRelease/res/mipmap-xxhdpi/ic_launcher_final.png b/...stcomm-olympus/app/src/communityRelease/res/mipmap-xxhdpi/ic_launcher_final.png
diff --git a/...tcomm-olympus/app/src/communityRelease/res/mipmap-xxxhdpi/ic_launcher_final.png b/...tcomm-olympus/app/src/communityRelease/res/mipmap-xxxhdpi/ic_launcher_final.png