sdk's updated with input parameter validation, version 2.1.0, docs up…

…dated
polarofficial · Apr 18, 2019 · 7730c51 · 7730c51
1 parent d7a43e5
commit 7730c51
Show file tree

Hide file tree

Showing 81 changed files with 767 additions and 355 deletions.
diff --git a/...Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/ECGActivity.java b/...Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/ECGActivity.java
@@ -29,6 +29,7 @@
 import polar.com.sdk.api.model.PolarEcgData;
 import polar.com.sdk.api.model.PolarHrData;
 import polar.com.sdk.api.model.PolarSensorSetting;
+import polar.com.sdk.api.errors.PolarInvalidArgument;
 
 public class ECGActivity extends AppCompatActivity implements PlotterListener {
 
@@ -141,7 +142,11 @@ public void polarFtpFeatureReady(String s) {
                 Log.d(TAG, "Polar FTP ready " + s);
             }
         });
-        api.connectToDevice(DEVICE_ID);
+        try {
+            api.connectToDevice(DEVICE_ID);
+        } catch (PolarInvalidArgument a){
+            a.printStackTrace();
+        }
 
         plotter = new Plotter(this, "ECG");
         plotter.setListener(this);

diff --git a/...-Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/HRActivity.java b/...-Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/HRActivity.java
@@ -23,6 +23,7 @@
 import polar.com.sdk.api.PolarBleApiDefaultImpl;
 import polar.com.sdk.api.model.PolarDeviceInfo;
 import polar.com.sdk.api.model.PolarHrData;
+import polar.com.sdk.api.errors.PolarInvalidArgument;
 
 public class HRActivity extends AppCompatActivity implements PlotterListener {
 
@@ -142,7 +143,11 @@ public void polarFtpFeatureReady(String s) {
                 Log.d(TAG, "Polar FTP ready " + s);
             }
         });
-        api.connectToDevice(DEVICE_ID);
+        try {
+            api.connectToDevice(DEVICE_ID);
+        } catch (PolarInvalidArgument a){
+            a.printStackTrace();
+        }
 
         plotter = new TimePlotter(this, "HR/RR");
         plotter.setListener(this);

diff --git a/...rSDK-Exercise-Demo/app/src/main/java/com/polar/polarsdkexercisedemo/ExerciseActivity.java b/...rSDK-Exercise-Demo/app/src/main/java/com/polar/polarsdkexercisedemo/ExerciseActivity.java
@@ -22,6 +22,7 @@
 import polar.com.sdk.api.PolarBleApi;
 import polar.com.sdk.api.PolarBleApiCallback;
 import polar.com.sdk.api.PolarBleApiDefaultImpl;
+import polar.com.sdk.api.errors.PolarInvalidArgument;
 import polar.com.sdk.api.model.PolarDeviceInfo;
 import polar.com.sdk.api.model.PolarExerciseEntry;
 import polar.com.sdk.api.model.PolarHrData;
@@ -148,32 +149,36 @@ public void polarFtpFeatureReady(String s) {
     @SuppressLint("CheckResult")
     public void listExercises(){
         api.listExercises(deviceId).observeOn(AndroidSchedulers.mainThread()).subscribe(
-                new Consumer<PolarExerciseEntry>() {
-                    @Override
-                    public void accept(PolarExerciseEntry polarExerciseEntry) throws Exception {
-                        entries.add(polarExerciseEntry);
-                        adapter.notifyDataSetChanged();
-                    }
-                },
-                new Consumer<Throwable>() {
-                    @Override
-                    public void accept(Throwable throwable) throws Exception {
-                        Log.d(TAG,throwable.getLocalizedMessage());
-                    }
-                },
-                new Action() {
-                    @Override
-                    public void run() throws Exception {
-
-                    }
+            new Consumer<PolarExerciseEntry>() {
+                @Override
+                public void accept(PolarExerciseEntry polarExerciseEntry) throws Exception {
+                    entries.add(polarExerciseEntry);
+                    adapter.notifyDataSetChanged();
                 }
+            },
+            new Consumer<Throwable>() {
+                @Override
+                public void accept(Throwable throwable) throws Exception {
+                    Log.d(TAG,throwable.getLocalizedMessage());
+                }
+            },
+            new Action() {
+                @Override
+                public void run() throws Exception {
+
+                }
+            }
         );
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        api.disconnectFromDevice(deviceId);
+        try {
+            api.disconnectFromDevice(deviceId);
+        } catch (PolarInvalidArgument polarInvalidArgument) {
+            polarInvalidArgument.printStackTrace();
+        }
     }
 
     //PlotterListener

diff --git a/demos/iOS-Demos/PolarSDK-Broadcast-Demo/PolarSDK-Broadcast-Demo/AppDelegate.swift b/demos/iOS-Demos/PolarSDK-Broadcast-Demo/PolarSDK-Broadcast-Demo/AppDelegate.swift
@@ -1,10 +1,3 @@
-//
-//  AppDelegate.swift
-//  PolarSDK-Broadcast-Demo
-//
-//  Created by Mikko Jokinen on 23/11/2018.
-//  Copyright © 2018 Polar. All rights reserved.
-//
 
 import UIKit
 

diff --git a/...s/iOS-Demos/PolarSDK-Broadcast-Demo/PolarSDK-Broadcast-Demo/PolarCollectionViewCell.swift b/...s/iOS-Demos/PolarSDK-Broadcast-Demo/PolarSDK-Broadcast-Demo/PolarCollectionViewCell.swift
@@ -1,10 +1,3 @@
-//
-//  PolarCollectionViewCell.swift
-//  PolarSDK-Broadcast-Demo
-//
-//  Created by Mikko Jokinen on 23/11/2018.
-//  Copyright © 2018 Polar. All rights reserved.
-//
 
 import UIKit
 

diff --git a/demos/iOS-Demos/PolarSDK-Exercise-Demo/PolarSDK-Exercise-Demo/AppDelegate.swift b/demos/iOS-Demos/PolarSDK-Exercise-Demo/PolarSDK-Exercise-Demo/AppDelegate.swift
@@ -1,10 +1,3 @@
-//
-//  AppDelegate.swift
-//  PolarSDK-Exercise-Demo
-//
-//  Created by Mikko Jokinen on 23/11/2018.
-//  Copyright © 2018 Polar. All rights reserved.
-//
 
 import UIKit
 

diff --git a/demos/iOS-Demos/PolarSDK-Exercise-Demo/PolarSDK-Exercise-Demo/PolarTableViewCell.swift b/demos/iOS-Demos/PolarSDK-Exercise-Demo/PolarSDK-Exercise-Demo/PolarTableViewCell.swift
@@ -1,10 +1,3 @@
-//
-//  PolarTableViewCell.swift
-//  PolarSDK-Exercise-Demo
-//
-//  Created by Mikko Jokinen on 26/11/2018.
-//  Copyright © 2018 Polar. All rights reserved.
-//
 
 import UIKit
 
@@ -21,5 +14,4 @@ class PolarTableViewCell: UITableViewCell {
 
         // Configure the view for the selected state
     }
-
 }
diff --git a/...-android/androidBleSdkTestApp/app/src/main/java/polar/com/androidblesdk/MainActivity.java b/...-android/androidBleSdkTestApp/app/src/main/java/polar/com/androidblesdk/MainActivity.java
@@ -12,6 +12,7 @@
 
 import org.reactivestreams.Publisher;
 
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.UUID;
@@ -24,6 +25,7 @@
 import polar.com.sdk.api.PolarBleApi;
 import polar.com.sdk.api.PolarBleApiCallback;
 import polar.com.sdk.api.PolarBleApiDefaultImpl;
+import polar.com.sdk.api.errors.PolarInvalidArgument;
 import polar.com.sdk.api.model.PolarAccelerometerData;
 import polar.com.sdk.api.model.PolarDeviceInfo;
 import polar.com.sdk.api.model.PolarEcgData;
@@ -44,7 +46,7 @@ public class MainActivity extends AppCompatActivity {
     Disposable ppgDisposable;
     Disposable ppiDisposable;
     Disposable scanDisposable;
-    String DEVICE_ID = "24FDA820"; // TODO replace with your device id
+    String DEVICE_ID = "218DDA23"; // or bt address like F5:A7:B8:EF:7A:D1 // TODO replace with your device id
     Disposable autoConnectDisposable;
     PolarExerciseEntry exerciseEntry;
 
@@ -279,14 +281,22 @@ public void run() throws Exception {
         connect.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                api.connectToDevice(DEVICE_ID);
+                try {
+                    api.connectToDevice(DEVICE_ID);
+                } catch (PolarInvalidArgument polarInvalidArgument) {
+                    polarInvalidArgument.printStackTrace();
+                }
             }
         });
 
         disconnect.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                api.disconnectFromDevice(DEVICE_ID);
+                try {
+                    api.disconnectFromDevice(DEVICE_ID);
+                } catch (PolarInvalidArgument polarInvalidArgument) {
+                    polarInvalidArgument.printStackTrace();
+                }
             }
         });
 

diff --git a/examples/example-ios/polarBleSdkTestApp/ApiWrapperSwift.swift b/examples/example-ios/polarBleSdkTestApp/ApiWrapperSwift.swift
@@ -95,11 +95,15 @@ import RxSwift
     }
 
     @objc func connectToPolarDevice(_ identifier: String) {
-        self.api.connectToDevice(identifier)
+        do{
+            try self.api.connectToDevice(identifier)
+        } catch {}
     }
 
     @objc func disconnectFromPolarDevice(_ identifier: String) {
-        self.api.disconnectFromDevice(identifier)
+        do{
+            try self.api.disconnectFromDevice(identifier)
+        } catch {}
     }
 
     @objc func isFeatureReady(_ identifier: String, feature: Int) -> Bool {

diff --git a/examples/example-ios/polarBleSdkTestApp/ViewController.swift b/examples/example-ios/polarBleSdkTestApp/ViewController.swift
@@ -72,11 +72,19 @@ class ViewController: UIViewController,
     }
 
     @IBAction func connectToDevice(_ sender: Any) {
-        api.connectToDevice(deviceId)
+        do{
+            try api.connectToDevice(deviceId)
+        } catch let err {
+            print("\(err)")
+        }
     }
 
     @IBAction func disconnectFromDevice(_ sender: Any) {
-        api.disconnectFromDevice(deviceId)
+        do{
+            try api.disconnectFromDevice(deviceId)
+        } catch let err {
+            print("\(err)")
+        }
     }
 
     @IBAction func accToggle(_ sender: Any) {

diff --git a/polar-sdk-android/docs/html/BDBleApiImpl_8java_source.html b/polar-sdk-android/docs/html/BDBleApiImpl_8java_source.html
diff --git a/polar-sdk-android/docs/html/PolarBleApiDefaultImpl_8java_source.html b/polar-sdk-android/docs/html/PolarBleApiDefaultImpl_8java_source.html
@@ -66,14 +66,14 @@
 <div class="title">PolarBleApiDefaultImpl.java</div>  </div>
 </div><!--header-->
 <div class="contents">
-<a href="PolarBleApiDefaultImpl_8java.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">// Copyright © 2019 Polar Electro Oy. All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="keyword">package </span>polar.com.sdk.api;</div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;</div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="keyword">import</span> android.content.Context;</div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;</div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="keyword">import</span> com.androidcommunications.polar.api.ble.BleRefApiVersion;</div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;</div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="keyword">import</span> <a class="code" href="namespacepolar.html">polar</a>.<a class="code" href="namespacepolar_1_1com.html">com</a>.<a class="code" href="namespacepolar_1_1com_1_1sdk.html">sdk</a>.<a class="code" href="namespacepolar_1_1com_1_1sdk_1_1impl.html">impl</a>.<a class="code" href="classpolar_1_1com_1_1sdk_1_1impl_1_1BDBleApiImpl.html">BDBleApiImpl</a>;</div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00013"></a><span class="lineno"><a class="line" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html">   13</a></span>&#160;<span class="keyword">public</span> <span class="keyword">class </span><a class="code" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html">PolarBleApiDefaultImpl</a> {</div><div class="line"><a name="l00020"></a><span class="lineno"><a class="line" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html#ae9faebaa48b7943c86ac54129b2f25a8">   20</a></span>&#160;    <span class="keyword">public</span> <span class="keyword">static</span> <a class="code" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApi.html">PolarBleApi</a> <a class="code" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html#ae9faebaa48b7943c86ac54129b2f25a8">defaultImplementation</a>(<span class="keyword">final</span> Context context, <span class="keywordtype">int</span> features){</div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">new</span> <a class="code" href="classpolar_1_1com_1_1sdk_1_1impl_1_1BDBleApiImpl.html">BDBleApiImpl</a>(context,features);</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;    }</div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div><div class="line"><a name="l00027"></a><span class="lineno"><a class="line" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html#a8ced2a3644832ffd8f3f07bc043bd8ec">   27</a></span>&#160;    <span class="keyword">public</span> <span class="keyword">static</span> String <a class="code" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html#a8ced2a3644832ffd8f3f07bc043bd8ec">versionInfo</a>(){</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;        <span class="keywordflow">return</span> <span class="stringliteral">&quot;2.0.0&quot;</span>;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;    }</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;}</div><div class="ttc" id="classpolar_1_1com_1_1sdk_1_1impl_1_1BDBleApiImpl_html"><div class="ttname"><a href="classpolar_1_1com_1_1sdk_1_1impl_1_1BDBleApiImpl.html">polar.com.sdk.impl.BDBleApiImpl</a></div><div class="ttdef"><b>Definition:</b> <a href="BDBleApiImpl_8java_source.html#l00091">BDBleApiImpl.java:91</a></div></div>
+<a href="PolarBleApiDefaultImpl_8java.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">// Copyright © 2019 Polar Electro Oy. All rights reserved.</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="keyword">package </span>polar.com.sdk.api;</div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;</div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="keyword">import</span> android.content.Context;</div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;</div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="keyword">import</span> com.androidcommunications.polar.api.ble.BleRefApiVersion;</div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;</div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="keyword">import</span> <a class="code" href="namespacepolar.html">polar</a>.<a class="code" href="namespacepolar_1_1com.html">com</a>.<a class="code" href="namespacepolar_1_1com_1_1sdk.html">sdk</a>.<a class="code" href="namespacepolar_1_1com_1_1sdk_1_1impl.html">impl</a>.<a class="code" href="classpolar_1_1com_1_1sdk_1_1impl_1_1BDBleApiImpl.html">BDBleApiImpl</a>;</div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00013"></a><span class="lineno"><a class="line" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html">   13</a></span>&#160;<span class="keyword">public</span> <span class="keyword">class </span><a class="code" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html">PolarBleApiDefaultImpl</a> {</div><div class="line"><a name="l00020"></a><span class="lineno"><a class="line" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html#ae9faebaa48b7943c86ac54129b2f25a8">   20</a></span>&#160;    <span class="keyword">public</span> <span class="keyword">static</span> <a class="code" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApi.html">PolarBleApi</a> <a class="code" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html#ae9faebaa48b7943c86ac54129b2f25a8">defaultImplementation</a>(<span class="keyword">final</span> Context context, <span class="keywordtype">int</span> features){</div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">new</span> <a class="code" href="classpolar_1_1com_1_1sdk_1_1impl_1_1BDBleApiImpl.html">BDBleApiImpl</a>(context,features);</div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;    }</div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div><div class="line"><a name="l00027"></a><span class="lineno"><a class="line" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html#a8ced2a3644832ffd8f3f07bc043bd8ec">   27</a></span>&#160;    <span class="keyword">public</span> <span class="keyword">static</span> String <a class="code" href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html#a8ced2a3644832ffd8f3f07bc043bd8ec">versionInfo</a>(){</div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;        <span class="keywordflow">return</span> <span class="stringliteral">&quot;2.1.0&quot;</span>;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;    }</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;}</div><div class="ttc" id="classpolar_1_1com_1_1sdk_1_1impl_1_1BDBleApiImpl_html"><div class="ttname"><a href="classpolar_1_1com_1_1sdk_1_1impl_1_1BDBleApiImpl.html">polar.com.sdk.impl.BDBleApiImpl</a></div><div class="ttdef"><b>Definition:</b> <a href="BDBleApiImpl_8java_source.html#l00090">BDBleApiImpl.java:90</a></div></div>
 <div class="ttc" id="namespacepolar_html"><div class="ttname"><a href="namespacepolar.html">polar</a></div></div>
 <div class="ttc" id="namespacepolar_1_1com_html"><div class="ttname"><a href="namespacepolar_1_1com.html">polar.com</a></div></div>
 <div class="ttc" id="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl_html"><div class="ttname"><a href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html">polar.com.sdk.api.PolarBleApiDefaultImpl</a></div><div class="ttdef"><b>Definition:</b> <a href="PolarBleApiDefaultImpl_8java_source.html#l00013">PolarBleApiDefaultImpl.java:13</a></div></div>
 <div class="ttc" id="namespacepolar_1_1com_1_1sdk_html"><div class="ttname"><a href="namespacepolar_1_1com_1_1sdk.html">polar.com.sdk</a></div></div>
 <div class="ttc" id="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl_html_ae9faebaa48b7943c86ac54129b2f25a8"><div class="ttname"><a href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html#ae9faebaa48b7943c86ac54129b2f25a8">polar.com.sdk.api.PolarBleApiDefaultImpl.defaultImplementation</a></div><div class="ttdeci">static PolarBleApi defaultImplementation(final Context context, int features)</div><div class="ttdef"><b>Definition:</b> <a href="PolarBleApiDefaultImpl_8java_source.html#l00020">PolarBleApiDefaultImpl.java:20</a></div></div>
 <div class="ttc" id="namespacepolar_1_1com_1_1sdk_1_1impl_html"><div class="ttname"><a href="namespacepolar_1_1com_1_1sdk_1_1impl.html">polar.com.sdk.impl</a></div><div class="ttdef"><b>Definition:</b> <a href="BDBleApiImpl_8java_source.html#l00002">BDBleApiImpl.java:2</a></div></div>
-<div class="ttc" id="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApi_html"><div class="ttname"><a href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApi.html">polar.com.sdk.api.PolarBleApi</a></div><div class="ttdef"><b>Definition:</b> <a href="PolarBleApi_8java_source.html#l00031">PolarBleApi.java:31</a></div></div>
+<div class="ttc" id="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApi_html"><div class="ttname"><a href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApi.html">polar.com.sdk.api.PolarBleApi</a></div><div class="ttdef"><b>Definition:</b> <a href="PolarBleApi_8java_source.html#l00032">PolarBleApi.java:32</a></div></div>
 <div class="ttc" id="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl_html_a8ced2a3644832ffd8f3f07bc043bd8ec"><div class="ttname"><a href="classpolar_1_1com_1_1sdk_1_1api_1_1PolarBleApiDefaultImpl.html#a8ced2a3644832ffd8f3f07bc043bd8ec">polar.com.sdk.api.PolarBleApiDefaultImpl.versionInfo</a></div><div class="ttdeci">static String versionInfo()</div><div class="ttdef"><b>Definition:</b> <a href="PolarBleApiDefaultImpl_8java_source.html#l00027">PolarBleApiDefaultImpl.java:27</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->

diff --git a/polar-sdk-android/docs/html/PolarBleApi_8java_source.html b/polar-sdk-android/docs/html/PolarBleApi_8java_source.html