diff --git a/ComApp/android/app/build.gradle b/ComApp/android/app/build.gradle index 5fd9258..d335060 100644 --- a/ComApp/android/app/build.gradle +++ b/ComApp/android/app/build.gradle @@ -135,11 +135,11 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - applicationId "com.comintl.app" + applicationId "com.comapp.ldc" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 - versionName "1.2" + versionName "2.0" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ComApp/android/app/src/main/res/values/strings.xml b/ComApp/android/app/src/main/res/values/strings.xml index 116c7bc..a8abf61 100644 --- a/ComApp/android/app/src/main/res/values/strings.xml +++ b/ComApp/android/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ contain - Commerciaux - LDC International + Commerciaux LDC diff --git a/ComApp/src/App/Controllers/SyncController.js b/ComApp/src/App/Controllers/SyncController.js index 12b9263..1e14b61 100644 --- a/ComApp/src/App/Controllers/SyncController.js +++ b/ComApp/src/App/Controllers/SyncController.js @@ -10,7 +10,6 @@ import * as Application from 'expo-application'; import { Setting, Contact, SendBrochure, Document } from '../../Database'; const api_token = 'toto'; -const app_uuid = '1f6eda31-1f6d-49fe-aa81-4f0aece0f7ca'; class SyncController { @@ -22,6 +21,14 @@ class SyncController { return test.value; } + getAppStoreUUID() { + const test = Setting.get('AppStoreUUID'); + if (test === false || test === undefined) { + return "noset"; + } + return test.value; + } + async checkConnection() { NetInfo.fetch().then(state => { return state.isConnected; @@ -36,7 +43,7 @@ class SyncController { responseType: 'json', params: { token: api_token, - app_uuid: app_uuid, + app_uuid: this.getAppStoreUUID(), app_version: Application.nativeApplicationVersion }, }); diff --git a/ComApp/src/App/Views/InstallScreen.js b/ComApp/src/App/Views/InstallScreen.js index 6907edb..5872834 100644 --- a/ComApp/src/App/Views/InstallScreen.js +++ b/ComApp/src/App/Views/InstallScreen.js @@ -95,6 +95,7 @@ class InstallScreen extends React.Component { _.forEach(response.data.datas, function (value, key) { switch (key) { case "MainColor": + case "AppStoreUUID": Setting.upsert({ key: key, value: value }); break; case "SquaredLogo":