Version 1.15.0

- Migration to API 23
- Handling requesting permissions
- Switching configurations in UART profile
- New scanner compat library used for scanning

Author: philips77

.idea/encodings.xml

@@ -71,8 +71,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/no.nordicsemi.android.support.v18/scanner/0.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -88,15 +89,18 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 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="design-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="design-23.0.0" level="project" />
     <orderEntry type="library" exported="" name="nrf-logger-v2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="stax-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="scanner-0.1.1" level="project" />
     <orderEntry type="library" exported="" name="achartengine-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="simple-xml-2.7.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
     <orderEntry type="module" module-name="dfu" exported="" />
   </component>
 </module>

.idea/gradle.xml

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.0'
     defaultConfig {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
-        targetSdkVersion 22
-        versionCode 36
-        versionName "1.14.3"
+        targetSdkVersion 23
+        versionCode 37
+        versionName "1.15.0"
     }
     buildTypes {
         release {
@@ -20,8 +20,13 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.1'
-    compile 'com.android.support:design:22.2.1'
+    compile 'com.android.support:appcompat-v7:23.0.0'
+    compile 'com.android.support:design:23.0.0'
+    compile 'no.nordicsemi.android.support.v18:scanner:0.1.1'
+    compile('org.simpleframework:simple-xml:2.7.1') {
+        exclude group: 'stax', module: 'stax-api'
+        exclude group: 'xpp3', module: 'xpp3'
+    }
     compile project(':dfu')
     compile files('libs/achartengine-1.1.0.jar')
     compile files('libs/nrf-logger-v2.0.jar')

.idea/misc.xml

@@ -22,24 +22,20 @@
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="no.nordicsemi.android.nrftoolbox"
-	android:installLocation="auto"
-	android:versionCode="35"
-	android:versionName="1.14.2" >
-
-	<uses-sdk
-		android:minSdkVersion="18"
-		android:targetSdkVersion="22" />
+	android:installLocation="auto">
 
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.BLUETOOTH" />
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<uses-permission android:name="no.nordicsemi.android.LOG" />
 
 	<uses-feature
 		android:name="android.hardware.bluetooth_le"
 		android:required="true" />
 
 	<application
+		android:fullBackupContent="true"
 		android:allowBackup="true"
 		android:icon="@drawable/ic_launcher"
 		android:label="@string/app_name"
@@ -183,7 +179,7 @@
 			android:name="no.nordicsemi.android.nrftoolbox.uart.UARTActivity"
 			android:icon="@drawable/ic_uart_feature"
 			android:label="@string/uart_feature_title"
-			android:windowSoftInputMode="stateHidden"
+			android:windowSoftInputMode="adjustResize"
 			android:launchMode="singleTask" >
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />

.idea/runConfigurations.xml

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2015, Nordic Semiconductor
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * 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 no.nordicsemi.android.nrftoolbox;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
+
+public class PermissionRationaleFragment extends DialogFragment {
+	private static final String ARG_PERMISSION = "ARG_PERMISSION";
+	private static final String ARG_TEXT = "ARG_TEXT";
+
+	private PermissionDialogListener mListener;
+
+	public interface PermissionDialogListener {
+		public void onRequestPermission(final String permission);
+	}
+
+	@Override
+	public void onAttach(final Context context) {
+		super.onAttach(context);
+
+		if (context instanceof PermissionDialogListener) {
+			mListener = (PermissionDialogListener) context;
+		} else {
+			throw new IllegalArgumentException("The parent activity must impelemnt PermissionDialogListener");
+		}
+	}
+
+	@Override
+	public void onDetach() {
+		super.onDetach();
+		mListener = null;
+	}
+
+	public static PermissionRationaleFragment getInstance(final int aboutResId, final String permission) {
+		final PermissionRationaleFragment fragment = new PermissionRationaleFragment();
+
+		final Bundle args = new Bundle();
+		args.putInt(ARG_TEXT, aboutResId);
+		args.putString(ARG_PERMISSION, permission);
+		fragment.setArguments(args);
+
+		return fragment;
+	}
+
+	@Override
+    @NonNull
+	public Dialog onCreateDialog(final Bundle savedInstanceState) {
+		final Bundle args = getArguments();
+		final StringBuilder text = new StringBuilder(getString(args.getInt(ARG_TEXT)));
+		return new AlertDialog.Builder(getActivity()).setTitle(R.string.permission_title).setMessage(text)
+				.setNegativeButton(R.string.cancel, null)
+				.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(final DialogInterface dialog, final int which) {
+						mListener.onRequestPermission(args.getString(ARG_PERMISSION));
+					}
+				}).create();
+	}
+}

app/app.iml

@@ -32,6 +32,7 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.app.NotificationCompat;
 
 import no.nordicsemi.android.log.Logger;
 import no.nordicsemi.android.nrftoolbox.FeaturesActivity;
@@ -138,7 +139,7 @@ public void onWheelMeasurementReceived(final int wheelRevolutions, final int las
 			return;
 
 		if (mLastWheelRevolutions >= 0) {
-			float timeDifference = 0;
+			float timeDifference;
 			if (lastWheelEventTime < mLastWheelEventTime)
 				timeDifference = (65535 + lastWheelEventTime - mLastWheelEventTime) / 1024.0f; // [s]
 			else
@@ -167,7 +168,7 @@ public void onCrankMeasurementReceived(int crankRevolutions, int lastCrankEventT
 			return;
 
 		if (mLastCrankRevolutions >= 0) {
-			float timeDifference = 0;
+			float timeDifference;
 			if (lastCrankEventTime < mLastCrankEventTime)
 				timeDifference = (65535 + lastCrankEventTime - mLastCrankEventTime) / 1024.0f; // [s]
 			else
@@ -206,11 +207,12 @@ private void createNotification(final int messageResId, final int defaults) {
 
 		// both activities above have launchMode="singleTask" in the AndroidManifest.xml file, so if the task is already running, it will be resumed
 		final PendingIntent pendingIntent = PendingIntent.getActivities(this, OPEN_ACTIVITY_REQ, new Intent[] { parentIntent, targetIntent }, PendingIntent.FLAG_UPDATE_CURRENT);
-		final Notification.Builder builder = new Notification.Builder(this).setContentIntent(pendingIntent);
+		final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+		builder.setContentIntent(pendingIntent);
 		builder.setContentTitle(getString(R.string.app_name)).setContentText(getString(messageResId, getDeviceName()));
 		builder.setSmallIcon(R.drawable.ic_stat_notify_csc);
 		builder.setShowWhen(defaults != 0).setDefaults(defaults).setAutoCancel(true).setOngoing(true);
-		builder.addAction(R.drawable.ic_action_bluetooth, getString(R.string.csc_notification_action_disconnect), disconnectAction);
+		builder.addAction(new NotificationCompat.Action(R.drawable.ic_action_bluetooth, getString(R.string.csc_notification_action_disconnect), disconnectAction));
 
 		final Notification notification = builder.build();
 		final NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);