ST BLE Sensor v 4.7.0 Source code

add ST WIN Support
fix AWS Dashboard cloud provider

Author: GiovanniVisentiniST

.gitmodules

@@ -1,6 +1,9 @@
-[submodule "BlueSTSDK"]
-	path = BlueSTSDK
-	url = https://github.com/STMicroelectronics/BlueSTSDK_Android.git
 [submodule "BlueSTSDK_Gui_Android"]
 	path = BlueSTSDK_Gui_Android
-	url = https://github.com/STMicroelectronics/BlueSTSDK_GUI_Android.git
+	url = git@github.com:STMicroelectronics/BlueSTSDK_GUI_Android.git
+[submodule "BlueSTSDK"]
+	path = BlueSTSDK
+	url = git@github.com:STMicroelectronics/BlueSTSDK_Android.git
+[submodule "STWINBoard_GUI_Android"]
+	path = STWINBoard_GUI_Android
+	url = git@github.com:STMicroelectronics/STWINBoard_GUI_Android.git

BlueMS/build.gradle

@@ -36,8 +36,9 @@
  */
 
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 
 static def getDate() {
     def date = new Date()
@@ -63,8 +64,8 @@ android {
 
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 40
-        versionName '4.6.1'
+        versionCode 46
+        versionName '4.7.0'
         applicationId "com.st.bluems"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -113,7 +114,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
     packagingOptions {
@@ -122,7 +123,7 @@ android {
 }
 
 ext {
-    leakcanaryVersion = '1.6.3'
+    leakcanaryVersion = '2.3'
 }
 
 repositories {
@@ -153,6 +154,7 @@ dependencies {
     implementation project(':BlueSTSDK')
     implementation project(':BlueSTSDK_Gui_Android')
     implementation project(':BlueMSCloud')
+    implementation project(path: ':STWINBoard_GUI_Android')
 
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
 
@@ -183,18 +185,13 @@ dependencies {
         exclude group: 'com.google.code.findbugs', module: 'annotations'
     }
 
-    //use the v 3.11 to avoid chrash with ibm
+    //use the v 3.11 to avoid crash with ibm
     implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.11.0'
 
-    // crashlytics
-    implementation group: 'com.crashlytics.sdk.android', name: 'crashlytics', version: '2.10.1'
-    //keep the 16.x to avoid android x to avoid new support library that will break the plot
-    implementation group: 'com.google.firebase', name: 'firebase-core', version: '17.2.1'
+    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
 
     //memory leak detector
     debugImplementation group: 'com.squareup.leakcanary', name: 'leakcanary-android', version: "$leakcanaryVersion"
-    releaseImplementation group: 'com.squareup.leakcanary', name: 'leakcanary-android-no-op', version: "$leakcanaryVersion"
-    testImplementation group: 'com.squareup.leakcanary', name: 'leakcanary-android-no-op', version: "$leakcanaryVersion"
 
     testImplementation group: 'org.json', name: 'json', version: '20140107'
     //since the json lib is inside the android sdk

BlueMS/proguard-rules.pro

@@ -16,6 +16,25 @@
 #   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>; }
@@ -26,7 +45,12 @@
 #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

@@ -66,14 +66,14 @@
 
         <service
             android:name=".demos.fftAmpitude.FFTExportedService"
-            android:exported="false"></service>
+            android:exported="false"/>
 
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboardHidden|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/FullscreenTheme">
+            android:theme="@style/AppFullscreenTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

BlueMS/src/main/ic_launcher-playstore.png

@@ -38,24 +38,7 @@
 
 import androidx.multidex.MultiDexApplication;
 
-import com.squareup.leakcanary.LeakCanary;
 
 public class BlueMSApplication extends MultiDexApplication {
 
-    private void initMemoryLeakDetector(){
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return;
-        }
-        LeakCanary.install(this);
-    }
-
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        initMemoryLeakDetector();
-    }
-
 }

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

@@ -55,6 +55,7 @@
 import com.st.BlueMS.demos.COSensor.COSensorDemoFragment;
 import com.st.BlueMS.demos.CarryPositionFragment;
 import com.st.BlueMS.demos.Cloud.CloudLogFragment;
+import com.st.BlueMS.demos.HighSpeedDataLog.HighSpeedDataLogFragment;
 import com.st.BlueMS.demos.Level.LevelDemoFragment;
 import com.st.BlueMS.demos.PredictiveMaintenance.PredictiveMaintenanceFragment;
 import com.st.BlueMS.demos.SDLog.SDLogFragment;
@@ -78,7 +79,6 @@
 import com.st.BlueMS.demos.multiNN.MultiNeuralNetworkFragment;
 import com.st.BlueMS.demos.plot.PlotFeatureFragment;
 import com.st.BlueMS.preference.nucleo.SettingsWithNucleoConfiguration;
-import com.st.BlueSTSDK.Debug;
 import com.st.BlueSTSDK.ExportedFeature;
 import com.st.BlueSTSDK.Features.Audio.Opus.ExportedFeatureAudioOpus;
 import com.st.BlueSTSDK.Node;
@@ -142,6 +142,7 @@ public static class LedButtonControlFragment extends com.st.STM32WB.p2pDemo.LedB
      */
     @SuppressWarnings("unchecked")
     private final static Class<? extends DemoFragment>[] ALL_DEMOS = new Class[]{
+            HighSpeedDataLogFragment.class,
             EnvironmentalSensorsFragment.class,
             MemsSensorFusionFragment.class,
             FFTAmplitudeFragment.class,
@@ -237,18 +238,22 @@ protected void onStart() {
         @Override
         public void onNotificationDisabled(@NonNull ExportedFeature onFeature) {
             Log.d("DEmoActivity","reload demos");
-            reloadDemoList();
+            runOnUiThread(()->{reloadDemoList();});
+
         }
 
         @Override
         public void onNotificationEnabled(@NonNull ExportedFeature onFeature) {
             Log.d("DEmoActivity","reload demos");
-            reloadDemoList();
+            runOnUiThread(()->{reloadDemoList();});
         }
     };
 
     private void enableServerSideDemo() {
-        NodeServer server = getNode().getNodeServer();
+        Node node = getNode();
+        if(node == null)
+            return;
+        NodeServer server = node.getNodeServer();
         if(server == null)
             return;
         ExportedFeature f = server.getExportedFeature(ExportedFeatureAudioOpus.class);
@@ -263,7 +268,10 @@ protected void onStop() {
     }
 
     private void disableServerSideDemo() {
-        NodeServer server = getNode().getNodeServer();
+        Node node = getNode();
+        if(node == null)
+            return;
+        NodeServer server = node.getNodeServer();
         if(server == null)
             return;
         ExportedFeature f = server.getExportedFeature(ExportedFeatureAudioOpus.class);

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

@@ -37,7 +37,7 @@
 
 package com.st.BlueMS;
 
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.Context;

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

@@ -50,6 +50,7 @@
 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;
 
@@ -62,24 +63,6 @@
  */
 public class MainActivity extends com.st.BlueSTSDK.gui.MainActivity {
 
-    private static final ArrayList<LibLicense> LIB_LICENSES = new ArrayList<>();
-    static {
-        LIB_LICENSES.add(new LibLicense("Android Design Support Library",R.raw.lic_android_support));
-        LIB_LICENSES.add(new LibLicense("Android Support Library v13",R.raw.lic_android_support));
-        LIB_LICENSES.add(new LibLicense("Android Annotations Support Library",R.raw.lic_android_support));
-        LIB_LICENSES.add(new LibLicense("Android Support Card View Library",R.raw.lic_android_support));
-        LIB_LICENSES.add(new LibLicense("Android Support Constraint Layout Library",R.raw.lic_android_support));
-        LIB_LICENSES.add(new LibLicense("Android Support AppCompat Library",R.raw.lic_android_support));
-        LIB_LICENSES.add(new LibLicense("Android Support GridLayout Library",R.raw.lic_android_support));
-        LIB_LICENSES.add(new LibLicense("Android Support RecyclerView Library",R.raw.lic_android_support));
-        LIB_LICENSES.add(new LibLicense("BlueSTSDK",R.raw.lic_bluestsdk));
-        LIB_LICENSES.add(new LibLicense("BlueSTSDK Gui",R.raw.lic_bluestsdk_gui));
-        LIB_LICENSES.add(new LibLicense("IBM Watson Cloud",R.raw.lic_ibm_watson_cloud));
-        LIB_LICENSES.add(new LibLicense("Paho",R.raw.lic_paho));
-        LIB_LICENSES.add(new LibLicense("Play Services Base",R.raw.lic_android_support));
-    }
-
-
     private static final String ABOUT_PAGE_URL = "file:///android_asset/about.html";
 
     @Override
@@ -90,7 +73,8 @@ public void startScanBleActivity(View view) {
     @Override
     public void startAboutActivity(View view) {
         URL privacyPage = getPrivacyPolicyUrl();
-        AboutActivity.startActivityWithAboutPage(this,ABOUT_PAGE_URL,privacyPage,LIB_LICENSES);
+        Intent licenseIntent = new Intent(this, OssLicensesMenuActivity.class);
+        AboutActivity.startActivityWithAboutPage(this,ABOUT_PAGE_URL,privacyPage,licenseIntent);
     }
 
     @Override

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

@@ -38,6 +38,10 @@
 package com.st.BlueMS;
 
 
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 
 import com.st.BlueNRG.fwUpgrade.BlueNRGAdvertiseFilter;
@@ -48,6 +52,7 @@
 import com.st.BlueSTSDK.Utils.ConnectionOption;
 import com.st.BlueSTSDK.Utils.advertise.AdvertiseFilter;
 import com.st.BlueSTSDK.gui.fwUpgrade.FwUpgradeActivity;
+import com.st.BlueSTSDK.gui.util.SimpleFragmentDialog;
 import com.st.STM32WB.fwUpgrade.FwUpgradeSTM32WBActivity;
 import com.st.STM32WB.fwUpgrade.feature.STM32OTASupport;
 import com.st.STM32WB.p2pDemo.Peer2PeerDemoConfiguration;
@@ -87,18 +92,58 @@ public void onNodeSelected(@NonNull Node n) {
 
         ConnectionOption options = optionsBuilder.build();
 
-        n.enableNodeServer(BLENodeDefines.FeatureCharacteristics.getDefaultExportedFeature());
+        //disable the ble server for sensor tile box, to improve stability for the fw upgrade.
+        // it is not clear why.. and probably is not the root cause
+        if(n.getType() != Node.Type.SENSOR_TILE_BOX) {
+            try {
+                n.enableNodeServer(BLENodeDefines.FeatureCharacteristics.getDefaultExportedFeature());
+            } catch (IllegalStateException e) {
+                Toast.makeText(this, R.string.nodeList_serverNotStarted, Toast.LENGTH_SHORT).show();
+            }
+        }
+
+
 
         if(n.getAdvertiseInfo() instanceof BlueNRGAdvertiseFilter.BlueNRGAdvertiseInfo)
             startActivity(FwUpgradeActivity.getStartIntent(this, n,false,options));
         else if(n.getType()== Node.Type.STEVAL_WESU1)
             startActivity(DemosActivityWesu.getStartIntent(this,n,options));
-        else if (STM32OTASupport.isOTANode(n)){
-            startActivity(FwUpgradeSTM32WBActivity.getStartIntent(this, n,null,null,null));
+        else if (STM32OTASupport.isOTANode(n)) {
+            startActivity(FwUpgradeSTM32WBActivity.getStartIntent(this, n, null, null, null));
+        }else if (n.getType() == Node.Type.SENSOR_TILE_BOX){
+            displayPinWarningsAndConnect(n,options);
         }else {
             startActivity(DemosActivity.getStartIntent(this, n, options));
         }
 
     }
 
+
+    private void displayPinWarningsAndConnect(Node node, ConnectionOption options){
+        if(stBoxPinDialogNeedToBeShown()){
+            displayPinWarnings(node,options);
+        }else{
+            startActivity(DemosActivity.getStartIntent(this, node, options));
+        }
+    }
+
+    private static final String STBOX_PIN_DIALOG_SHOWN = NodeListActivity.class.getCanonicalName()+".STBOX_PIN_DIALOG_SHOWN";
+    private static final String STBOX_PIN_DIALOG_SHOWN_TAG = NodeListActivity.class.getCanonicalName()+".STBOX_PIN_DIALOG_SHOWN_TAG";
+
+    private boolean stBoxPinDialogNeedToBeShown(){
+        final SharedPreferences prefs= PreferenceManager.getDefaultSharedPreferences(this);
+        return !prefs.contains(STBOX_PIN_DIALOG_SHOWN);
+    }
+
+    private void displayPinWarnings(Node node, ConnectionOption options) {
+        SimpleFragmentDialog dialog = SimpleFragmentDialog.newInstance(R.string.nodeList_stbox_pinTitle,R.string.nodeList_stbox_pinDesc);
+        dialog.show(getSupportFragmentManager(),STBOX_PIN_DIALOG_SHOWN_TAG);
+        dialog.setOnclickListener((dialogInterface, i) -> {
+            PreferenceManager.getDefaultSharedPreferences(this).edit()
+                    .putBoolean(STBOX_PIN_DIALOG_SHOWN,true)
+                    .apply();
+            startActivity(DemosActivity.getStartIntent(dialog.getContext(), node, options));
+        });
+    }
+
 }//NodeListActivity