Aligning to V4.7.1

Signed-off-by: Luca Pezzoni <pezzoni.luca@gmail.com>

Author: PezzoniL

BlueMS/build.gradle

@@ -64,8 +64,8 @@ android {
 
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 46
-        versionName '4.7.0'
+        versionCode 47
+        versionName '4.7.1'
         applicationId "com.st.bluems"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -79,6 +79,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             applicationIdSuffix ".debug"
             versionNameSuffix "-dev" + getDate()
         }
@@ -119,7 +121,10 @@ android {
 
     packagingOptions {
         exclude "thirdpartynotice.txt"
+        exclude 'maven.properties'
+        exclude 'META-INF/DEPENDENCIES'
     }
+
 }
 
 ext {
@@ -136,21 +141,6 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutineVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutineAndroidVersion"
 
-    components.all {
-        allVariants {
-            withDependencies { deps ->
-                deps.each { dep ->
-                    if (dep.group == 'org.eclipse.paho' && dep.name =='org.eclipse.paho.client.mqttv3') {
-                        dep.version {
-                            require "1.2.0"
-                        }
-                        dep.because "require api 24: https://github.com/eclipse/paho.mqtt.java/issues/633"
-                    }
-                }
-            }
-        }
-    }
-
     implementation project(':BlueSTSDK')
     implementation project(':BlueSTSDK_Gui_Android')
     implementation project(':BlueMSCloud')
@@ -204,6 +194,3 @@ dependencies {
 
 }
 
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-

BlueMS/proguard-rules.pro

@@ -16,41 +16,30 @@
 #   public *;
 #}
 
-<<<<<<< HEAD
--keep class com.androidplot.xy.** { *; }
--keep class com.androidplot.ui.** { *; }
-
-#retrofit proguard rules http://square.github.io/retrofit/
-# Platform calls Class.forName on types which do not exist on Android to determine platform.
--dontnote retrofit2.Platform
-# Platform used when running on Java 8 VMs. Will not be used at runtime
--dontwarn retrofit2.Platform$Java8
-# Retain generic type information for use by reflection by converters and adapters.
--keepattributes Signature
-# Retain declared checked exceptions for use by a Proxy instance.
--keepattributes Exceptions
-#retrofit 2.3 & co
--dontwarn javax.annotation.**
--dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-=======
->>>>>>> master
 
 #ibm watson
 #keep the class member name to avoid problems with json to java objects
 -keepclassmembers class com.ibm.watson.speech_to_text.v1.** { <fields>; }
 #ingore warnings about class that do not exist in android
 -dontwarn javax.naming.InitialContext
 -dontwarn javax.naming.Context
+-dontwarn javax.mail.internet.MimeBodyPart
+-dontwarn java.lang.instrument.ClassFileTransformer
+-dontwarn javax.mail.internet.SharedInputStream
+-dontwarn java.lang.ClassValue
+-dontwarn javax.activation.DataContentHandler
+-dontwarn okhttp3.internal.http.UnrepeatableRequestBody
+
+
+#need for Crashlytics
+-keepattributes *Annotation*                      # Keep Crashlytics annotations
+-keepattributes SourceFile,LineNumberTable        # Keep file names/line numbers
+-keep public class * extends java.lang.Exception
 
 #need for okhttp (audio websocket)
 # https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META-INF/proguard/okhttp3.pro
 # JSR 305 annotations are for embedding nullability information.
-<<<<<<< HEAD
--dontwarn javax.annotation.**
-
-=======
 #-dontwarn javax.annotation.**
->>>>>>> master
 # A resource is loaded with a relative path so the package of this class must be preserved.
 #-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
 # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.

BlueMS/src/main/AndroidManifest.xml

@@ -1,39 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2017  STMicroelectronics – All rights reserved
-  ~ The STMicroelectronics corporate logo is a trademark of STMicroelectronics
-  ~
-  ~ Redistribution and use in source and binary forms, with or without modification,
-  ~ are permitted provided that the following conditions are met:
-  ~
-  ~ - Redistributions of source code must retain the above copyright notice, this list of conditions
-  ~   and the following disclaimer.
-  ~
-  ~ - Redistributions in binary form must reproduce the above copyright notice, this list of
-  ~   conditions and the following disclaimer in the documentation and/or other materials provided
-  ~   with the distribution.
-  ~
-  ~ - Neither the name nor trademarks of STMicroelectronics International N.V. nor any other
-  ~   STMicroelectronics company nor the names of its contributors may be used to endorse or
-  ~   promote products derived from this software without specific prior written permission.
-  ~
-  ~ - All of the icons, pictures, logos and other images that are provided with the source code
-  ~   in a directory whose title begins with st_images may only be used for internal purposes and
-  ~   shall not be redistributed to any third party or modified in any way.
-  ~
-  ~ - Any redistributions in binary form shall not include the capability to display any of the
-  ~   icons, pictures, logos and other images that are provided with the source code in a directory
-  ~   whose title begins with st_images.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-  ~ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  ~ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
-  ~ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  ~ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  ~ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-  ~ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-  ~ OF SUCH DAMAGE.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.st.BlueMS">
 
@@ -153,7 +118,6 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.st.BlueMS.MainActivity" />
         </activity>
-        <!-- End: integrate the BlueSTSDK.gui activity in the app, setting the parent activity -->
         <activity android:name="com.st.BlueSTSDK.gui.fwUpgrade.FwUpgradeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

BlueMS/src/main/java/com/st/BlueMS/DemosActivity.java

@@ -86,14 +86,10 @@
 import com.st.BlueSTSDK.Utils.ConnectionOption;
 import com.st.BlueSTSDK.gui.demos.DemoDescriptionAnnotation;
 import com.st.BlueSTSDK.gui.demos.DemoFragment;
-import com.st.BlueSTSDK.gui.fwUpgrade.download.DownloadFwFileCompletedReceiver;
 import com.st.STM32WB.fwUpgrade.feature.RebootOTAModeFeature;
 import com.st.STM32WB.p2pDemo.feature.FeatureControlLed;
 import com.st.STM32WB.p2pDemo.feature.FeatureSwitchStatus;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -179,7 +175,6 @@ public static class LedButtonControlFragment extends com.st.STM32WB.p2pDemo.LedB
             //FeatureDebugFragment.class
     };
 
-    @SuppressWarnings("unchecked")
     @Override
     protected Class<? extends DemoFragment>[] getAllDemos() {
         ArrayList<Class<? extends DemoFragment>> demoList = new ArrayList<>(Arrays.asList(ALL_DEMOS));

BlueMS/src/main/java/com/st/BlueMS/MainActivity.java

@@ -38,24 +38,12 @@
 package com.st.BlueMS;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.preference.PreferenceManager;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
 
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity;
 import com.st.BlueSTSDK.gui.AboutActivity;
-import com.st.BlueSTSDK.gui.thirdPartyLibLicense.LibLicense;
 
 import java.net.URL;
-import java.util.ArrayList;
 
 /**
  * Entry point activity, it show a full screen image for 2s and than the button for start the

BlueMS/src/main/java/com/st/BlueMS/demos/AccEvent/AccEventFragment.java

@@ -119,7 +119,7 @@ public class AccEventFragment extends BaseDemoFragment implements AdapterView.On
      * @param type type of node that we are using
      * @return supported events
      */
-    private static DetectableEvent[] getDetectableEvent(Node.Type type){
+    public static DetectableEvent[] getDetectableEvent(Node.Type type){
         switch (type){
             case STEVAL_WESU1:
                 return WESU_SUPPORTED_EVENT;
@@ -139,7 +139,7 @@ private static DetectableEvent[] getDetectableEvent(Node.Type type){
     }
 
     /**
-     * default event to show for a specific not type
+     * default event to show for a specific node type
      * @param type type of board
      * @return default event for the board
      */

BlueMS/src/main/java/com/st/BlueMS/demos/Audio/SpeechToText/ASRServices/IBMWatson/WatsonARSEngine.java

@@ -1,39 +1,3 @@
-/*
- * Copyright (c) 2019  STMicroelectronics – All rights reserved
- * The STMicroelectronics corporate logo is a trademark of STMicroelectronics
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice, this list of conditions
- *   and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright notice, this list of
- *   conditions and the following disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name nor trademarks of STMicroelectronics International N.V. nor any other
- *   STMicroelectronics company nor the names of its contributors may be used to endorse or
- *   promote products derived from this software without specific prior written permission.
- *
- * - All of the icons, pictures, logos and other images that are provided with the source code
- *   in a directory whose title begins with st_images may only be used for internal purposes and
- *   shall not be redistributed to any third party or modified in any way.
- *
- * - Any redistributions in binary form shall not include the capability to display any of the
- *   icons, pictures, logos and other images that are provided with the source code in a directory
- *   whose title begins with st_images.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- */
 package com.st.BlueMS.demos.Audio.SpeechToText.ASRServices.IBMWatson;
 
 import android.content.Context;

BlueMS/src/main/java/com/st/BlueMS/demos/Audio/SpeechToText/ASRServices/IBMWatson/WatsonARSKey.java

@@ -1,41 +1,6 @@
-/*
- * Copyright (c) 2019  STMicroelectronics – All rights reserved
- * The STMicroelectronics corporate logo is a trademark of STMicroelectronics
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice, this list of conditions
- *   and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright notice, this list of
- *   conditions and the following disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name nor trademarks of STMicroelectronics International N.V. nor any other
- *   STMicroelectronics company nor the names of its contributors may be used to endorse or
- *   promote products derived from this software without specific prior written permission.
- *
- * - All of the icons, pictures, logos and other images that are provided with the source code
- *   in a directory whose title begins with st_images may only be used for internal purposes and
- *   shall not be redistributed to any third party or modified in any way.
- *
- * - Any redistributions in binary form shall not include the capability to display any of the
- *   icons, pictures, logos and other images that are provided with the source code in a directory
- *   whose title begins with st_images.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- */
 package com.st.BlueMS.demos.Audio.SpeechToText.ASRServices.IBMWatson;
 
+
 import android.content.Context;
 import android.content.SharedPreferences;
 

BlueMS/src/main/java/com/st/BlueMS/demos/Audio/Utils/AudioConverter.java

@@ -36,6 +36,7 @@
  */
 package com.st.BlueMS.demos.Audio.Utils;
 
+
 import java.io.IOException;
 import java.io.OutputStream;