Version 1.12

BleManagers refactoring, support for keeping bond information in DFU (DFU v0.6), support for Distribution packets in DFU.
swFan · Mar 13, 2015 · b0a078f · b0a078f
1 parent c245a33
commit b0a078f
Show file tree

Hide file tree

Showing 87 changed files with 3,576 additions and 2,404 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/app.iml b/app/app.iml
@@ -85,6 +85,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="nrf-logger-v2.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
         targetSdkVersion 21
-        versionCode 28
-        versionName "1.11.5"
+        versionCode 29
+        versionName "1.12.0"
     }
     buildTypes {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,8 +23,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="no.nordicsemi.android.nrftoolbox"
 	android:installLocation="auto"
-	android:versionCode="28"
-	android:versionName="1.11.5" >
+	android:versionCode="29"
+	android:versionName="1.12.0" >
 
 	<uses-sdk
 		android:minSdkVersion="18"

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/FeaturesActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/FeaturesActivity.java
@@ -21,9 +21,6 @@
  */
 package no.nordicsemi.android.nrftoolbox;
 
-import java.util.List;
-
-import no.nordicsemi.android.nrftoolbox.adapter.AppAdapter;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -49,6 +46,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import java.util.List;
+
+import no.nordicsemi.android.nrftoolbox.adapter.AppAdapter;
+
 public class FeaturesActivity extends ActionBarActivity {
 	private static final String MCP_CATEGORY = "no.nordicsemi.android.nrftoolbox.LAUNCHER";
 	private static final String UTILS_CATEGORY = "no.nordicsemi.android.nrftoolbox.UTILS";

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/adapter/AppAdapter.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/adapter/AppAdapter.java
@@ -21,11 +21,6 @@
  */
 package no.nordicsemi.android.nrftoolbox.adapter;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
-import no.nordicsemi.android.nrftoolbox.R;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -38,6 +33,12 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import no.nordicsemi.android.nrftoolbox.R;
+
 public class AppAdapter extends BaseAdapter {
 	private static final String CATEGORY = "no.nordicsemi.android.nrftoolbox.LAUNCHER";
 	private static final String MCP_PACKAGE = "no.nordicsemi.android.mcp";

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/app/ExpandableListActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/app/ExpandableListActivity.java
@@ -16,10 +16,6 @@
 
 package no.nordicsemi.android.nrftoolbox.app;
 
-import java.util.List;
-import java.util.Map;
-
-import no.nordicsemi.android.nrftoolbox.R;
 import android.app.Activity;
 import android.database.Cursor;
 import android.os.Bundle;
@@ -33,6 +29,11 @@
 import android.widget.SimpleCursorTreeAdapter;
 import android.widget.SimpleExpandableListAdapter;
 
+import java.util.List;
+import java.util.Map;
+
+import no.nordicsemi.android.nrftoolbox.R;
+
 /**
  * An activity that displays an expandable list of items by binding to a data source implementing the ExpandableListAdapter, and exposes event handlers when the
  * user selects an item.

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java
@@ -21,15 +21,17 @@
  */
 package no.nordicsemi.android.nrftoolbox.bpm;
 
+import android.os.Bundle;
+import android.widget.TextView;
+
 import java.util.Calendar;
 import java.util.UUID;
 
 import no.nordicsemi.android.nrftoolbox.R;
 import no.nordicsemi.android.nrftoolbox.profile.BleManager;
 import no.nordicsemi.android.nrftoolbox.profile.BleProfileActivity;
-import android.os.Bundle;
-import android.widget.TextView;
 
+// TODO The BPMActivity should be rewritten to use the service approach, like other do.
 public class BPMActivity extends BleProfileActivity implements BPMManagerCallbacks {
 	@SuppressWarnings("unused")
 	private static final String TAG = "BPMActivity";
@@ -60,6 +62,11 @@ private void setGUI() {
 		mTimestampView = (TextView) findViewById(R.id.timestamp);
 	}
 
+	@Override
+	protected int getLoggerProfileTitle() {
+		return R.string.bpm_feature_title;
+	}
+
 	@Override
 	protected int getDefaultDeviceName() {
 		return R.string.bpm_default_name;
@@ -77,7 +84,7 @@ protected UUID getFilterUUID() {
 
 	@Override
 	protected BleManager<BPMManagerCallbacks> initializeManager() {
-		final BPMManager manager = BPMManager.getBPMManager();
+		final BPMManager manager = BPMManager.getBPMManager(getApplicationContext());
 		manager.setGattCallbacks(this);
 		return manager;
 	}
@@ -100,12 +107,7 @@ public void onServicesDiscovered(final boolean optionalServicesFound) {
 	}
 
 	@Override
-	public void onBloodPressureMeasurementIndicationsEnabled() {
-		// this may notify user
-	}
-
-	@Override
-	public void onIntermediateCuffPressureNotificationEnabled() {
+	public void onDeviceReady() {
 		// this may notify user
 	}