Cleaned app's project structure

.gitignore

@@ -47,7 +47,7 @@ tests/linphonetester_*
 tests/tests.output
 WORK
 .d
-google-services.json
+app/google-services.json
 .*clang*
 **/*.iml
 src/linphone-wrapper

.gitmodules

@@ -1,122 +1,3 @@
-[submodule "submodules/linphone"]
+[submodule "linphone-sdk"]
-	path = submodules/linphone
+	path = linphone-sdk
-	url = https://gitlab.linphone.org/BC/public/linphone.git
+	url = git@gitlab.linphone.org:BC/public/linphone-sdk.git
-[submodule "submodules/externals/gsm"]
-	path = submodules/externals/gsm
-	url = https://gitlab.linphone.org/BC/public/external/gsm.git
-[submodule "submodules/externals/speex"]
-	path = submodules/externals/speex
-	url = https://gitlab.linphone.org/BC/public/external/speex.git
-[submodule "submodules/externals/ffmpeg"]
-	path = submodules/externals/ffmpeg
-	url = https://gitlab.linphone.org/BC/public/external/ffmpeg.git
-	ignore = dirty
-[submodule "submodules/externals/x264"]
-	path = submodules/externals/x264
-	url = https://gitlab.linphone.org/BC/public/external/x264.git
-	ignore = dirty
-[submodule "submodules/msx264"]
-	path = submodules/msx264
-	url = https://gitlab.linphone.org/BC/public/msx264.git
-[submodule "submodules/externals/opencore-amr"]
-	path = submodules/externals/opencore-amr
-	url = https://gitlab.linphone.org/BC/public/external/opencore-amr.git
-	ignore = dirty
-[submodule "submodules/msamr"]
-	path = submodules/msamr
-	url = https://gitlab.linphone.org/BC/public/msamr.git
-[submodule "submodules/externals/libvpx"]
-	path = submodules/externals/libvpx
-	url = https://gitlab.linphone.org/BC/public/external/libvpx.git
-	ignore = dirty
-[submodule "submodules/bzrtp"]
-	path = submodules/bzrtp
-	url = https://gitlab.linphone.org/BC/public/bzrtp.git
-[submodule "submodules/externals/srtp"]
-	path = submodules/externals/srtp
-	url = https://gitlab.linphone.org/BC/public/external/srtp.git
-[submodule "submodules/mssilk"]
-	path = submodules/mssilk
-	url = https://gitlab.linphone.org/BC/public/mssilk.git
-[submodule "submodules/bcg729"]
-	path = submodules/bcg729
-	url = https://gitlab.linphone.org/BC/public/bcg729.git
-[submodule "submodules/belle-sip"]
-	path = submodules/belle-sip
-	url = https://gitlab.linphone.org/BC/public/belle-sip.git
-[submodule "submodules/externals/libxml2"]
-	path = submodules/externals/libxml2
-	url = https://gitlab.linphone.org/BC/public/external/libxml2.git
-	ignore = dirty
-[submodule "submodules/externals/libupnp"]
-	path = submodules/externals/libupnp
-	url = https://gitlab.linphone.org/BC/public/external/libupnp.git
-[submodule "submodules/externals/opus"]
-	path = submodules/externals/opus
-	url = https://gitlab.linphone.org/BC/public/external/opus.git
-	ignore = dirty
-[submodule "submodules/mswebrtc"]
-	path = submodules/mswebrtc
-	url = https://gitlab.linphone.org/BC/public/mswebrtc.git
-[submodule "submodules/msopenh264"]
-	path = submodules/msopenh264
-	url = https://gitlab.linphone.org/BC/public/msopenh264.git
-[submodule "submodules/externals/openh264"]
-	path = submodules/externals/openh264
-	url = https://gitlab.linphone.org/BC/public/external/openh264.git
-	ignore = dirty
-[submodule "submodules/mscodec2"]
-	path = submodules/mscodec2
-	url = https://gitlab.linphone.org/BC/public/mscodec2.git
-[submodule "submodules/bctoolbox"]
-	path = submodules/bctoolbox
-	url = https://gitlab.linphone.org/BC/public/bctoolbox.git
-[submodule "submodules/externals/mbedtls"]
-	path = submodules/externals/mbedtls
-	url = https://gitlab.linphone.org/BC/public/external/mbedtls.git
-	ignore = dirty
-[submodule "submodules/cmake-builder"]
-	path = submodules/cmake-builder
-	url = https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git
-[submodule "submodules/externals/bv16-floatingpoint"]
-	path = submodules/externals/bv16-floatingpoint
-	url = https://gitlab.linphone.org/BC/public/external/bv16-floatingpoint.git
-[submodule "submodules/belr"]
-	path = submodules/belr
-	url = https://gitlab.linphone.org/BC/public/belr.git
-[submodule "submodules/belcard"]
-	path = submodules/belcard
-	url = https://gitlab.linphone.org/BC/public/belcard.git
-[submodule "submodules/bcunit"]
-	path = submodules/bcunit
-	url = https://gitlab.linphone.org/BC/public/bcunit.git
-[submodule "submodules/externals/vo-amrwbenc"]
-	path = submodules/externals/vo-amrwbenc
-	url = https://gitlab.linphone.org/BC/public/external/vo-amrwbenc.git
-[submodule "submodules/externals/codec2"]
-	path = submodules/externals/codec2
-	url = https://gitlab.linphone.org/BC/public/external/codec2.git
-[submodule "submodules/externals/libjpeg-turbo"]
-	path = submodules/externals/libjpeg-turbo
-	url = https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git
-[submodule "submodules/mediastreamer2"]
-	path = submodules/mediastreamer2
-	url = https://gitlab.linphone.org/BC/public/mediastreamer2.git
-[submodule "submodules/oRTP"]
-	path = submodules/oRTP
-	url = https://gitlab.linphone.org/BC/public/ortp.git
-[submodule "submodules/bcmatroska2"]
-	path = submodules/bcmatroska2
-	url = https://gitlab.linphone.org/BC/public/bcmatroska2.git
-[submodule "submodules/externals/xerces-c"]
-	path = submodules/externals/xerces-c
-	url = https://gitlab.linphone.org/BC/public/external/xerces-c.git
-[submodule "submodules/externals/libxsd"]
-	path = submodules/externals/libxsd
-	url = https://gitlab.linphone.org/BC/public/external/libxsd.git
-[submodule "submodules/externals/soci"]
-	path = submodules/externals/soci
-	url = https://gitlab.linphone.org/BC/public/external/soci.git
-[submodule "submodules/externals/zxing-cpp"]
-	path = submodules/externals/zxing-cpp
-	url = https://gitlab.linphone.org/BC/public/external/zxing-cpp.git

AndroidManifestSdk.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.linphone"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-          android:installLocation="auto"
-          android:versionCode="4001"
-          android:versionName="4.0.0">
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="28"/>
-</manifest>

app/.gitignore

@@ -0,0 +1 @@
+/build

app/build.gradle

@@ -0,0 +1,120 @@
+apply plugin: 'com.android.application'
+
+def getPackageName() {
+    return "org.linphone"
+}
+
+def firebaseEnabled() {
+    File googleFile = new File('google-services.json')
+    return googleFile.exists()
+}
+
+def isLocalAarAvailable() {
+    File debugAar = new File('linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-debug.aar')
+    File releaseAar = new File('linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar')
+    return debugAar.exists() || releaseAar.exists()
+}
+
+if (firebaseEnabled()) {
+    apply plugin: 'com.google.gms.google-services'
+}
+
+///// Exclude Files /////
+
+def excludeFiles = []
+// Exclude firebase file if not enable
+if (!firebaseEnabled()) {
+    excludeFiles.add('**/Firebase*')
+    println '[Push Notification] Firebase disabled'
+}
+
+def excludePackage = []
+
+excludePackage.add('**/gdb.*')
+excludePackage.add('**/libopenh264**')
+excludePackage.add('**/**tester**')
+excludePackage.add('**/LICENSE.txt')
+
+/////////////////////////
+
+repositories {
+    if (isLocalAarAvailable()) {
+        flatDir {
+            dirs './linphone-sdk/build/linphone-sdk/bin/outputs/aar/'
+        }
+    } else {
+        maven {
+            url "https://gitlab.linphone.org/BC/public/maven_repository/raw/master"
+        }
+    }
+}
+
+dependencies {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:+') {
+        exclude module: 'support-annotations'
+    }
+    androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
+    androidTestImplementation 'junit:junit:4.12'
+
+    if (firebaseEnabled()) {
+        classpath 'com.google.gms:google-services:3.1.0'
+        implementation 'com.google.firebase:firebase-messaging:15.0.2'
+    }
+    implementation 'org.apache.commons:commons-compress:1.16.1'
+    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+
+    if (isLocalAarAvailable()) {
+        implementation project(":linphone-sdk-android")
+    } else {
+        releaseImplementation 'org.linphone:liblinphone-sdk:${defaultConfig.versionName}'
+        debugImplementation 'org.linphone:liblinphone-sdk:${defaultConfig.versionName}-DEBUG'
+    }
+}
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 28
+        versionCode 4100
+        versionName "4.1"
+        applicationId getPackageName()
+        multiDexEnabled true
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    signingConfigs {
+        release {
+            storeFile file(RELEASE_STORE_FILE)
+            storePassword RELEASE_STORE_PASSWORD
+            keyAlias RELEASE_KEY_ALIAS
+            keyPassword RELEASE_KEY_PASSWORD
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled true
+            signingConfig signingConfigs.release
+        }
+        debug {
+            applicationIdSuffix ".debug"
+            debuggable true
+            jniDebuggable true
+        }
+    }
+
+    sourceSets {
+        main {
+            packagingOptions {
+                excludes = excludePackage
+            }
+        }
+    }
+    packagingOptions {
+        pickFirst 'META-INF/NOTICE'
+        pickFirst 'META-INF/LICENSE'
+        exclude 'META-INF/MANIFEST.MF'
+    }
+}

app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app/src/main/AndroidManifest.xml

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="org.linphone"
-          xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:android="http://schemas.android.com/apk/res/android"
-          android:installLocation="auto"
+    android:installLocation="auto">
-          android:versionCode="4002"
-          android:versionName="4.0.1">
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="28"/>
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>