From 43c11574a87a7bd85acda1e53fd2f10a0a9a2b00 Mon Sep 17 00:00:00 2001 From: Ruben van de Ven Date: Tue, 30 Oct 2018 13:14:57 +0100 Subject: [PATCH] Load token --- .gitignore | 1 + app/src/main/assets/token.example.json | 1 + .../heartbeatstreamer/MainActivity.java | 34 +++++++++++++++++++ .../heartrate/HeartRateService.java | 1 - 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 app/src/main/assets/token.example.json diff --git a/.gitignore b/.gitignore index fd45b12..ac5ed79 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /build /captures .externalNativeBuild +token.json diff --git a/app/src/main/assets/token.example.json b/app/src/main/assets/token.example.json new file mode 100644 index 0000000..1891753 --- /dev/null +++ b/app/src/main/assets/token.example.json @@ -0,0 +1 @@ +{"token":"abcdefghijklmnop"} diff --git a/app/src/main/java/com/rubenvandeven/heartbeatstreamer/MainActivity.java b/app/src/main/java/com/rubenvandeven/heartbeatstreamer/MainActivity.java index a2cec8c..b2fed41 100644 --- a/app/src/main/java/com/rubenvandeven/heartbeatstreamer/MainActivity.java +++ b/app/src/main/java/com/rubenvandeven/heartbeatstreamer/MainActivity.java @@ -15,6 +15,11 @@ import com.rubenvandeven.heartbeatstreamer.heartrate.Activity_AsyncScanHeartRate import com.rubenvandeven.heartbeatstreamer.heartrate.Activity_SearchUiHeartRateSampler; import com.rubenvandeven.heartbeatstreamer.heartrate.HeartRateService; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; @@ -127,4 +132,33 @@ public class MainActivity extends AppCompatActivity { } }; + /** + * Get the token for use with the syncing. + * @return + */ + public String getToken() { + String json = null; + String token = null; + + try { + InputStream is = getAssets().open("token.json"); + int size = is.available(); + byte[] buffer = new byte[size]; + is.read(buffer); + is.close(); + json = new String(buffer, "UTF-8"); + } catch (IOException ex) { + ex.printStackTrace(); + return null; + } + try { + JSONObject jsonObject = new JSONObject(json); + token = jsonObject.getString("token'"); + } catch (JSONException e) { + e.printStackTrace(); + return null; + } + return token; + } + } diff --git a/app/src/main/java/com/rubenvandeven/heartbeatstreamer/heartrate/HeartRateService.java b/app/src/main/java/com/rubenvandeven/heartbeatstreamer/heartrate/HeartRateService.java index b33c53e..735677f 100644 --- a/app/src/main/java/com/rubenvandeven/heartbeatstreamer/heartrate/HeartRateService.java +++ b/app/src/main/java/com/rubenvandeven/heartbeatstreamer/heartrate/HeartRateService.java @@ -53,7 +53,6 @@ public class HeartRateService extends Service { requestAccessToPcc(); } - /** * Start main thread, request location updates, start synchronization. *