Merge remote-tracking branch 'origin/BlueGPS4Droid_1.2.x' into BlueGPS4Cupcake_1.2.x

17 files changed, 233 insertions, 23 deletions

diff --git a/.classpath b/.classpath
index aff8e75..9f8bd3e 100644
--- a/.classpath
+++ b/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="src" path="gen"/>

 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>

+	<classpathentry kind="lib" path="lib/backport-android-bluetooth2.jar"/>

 	<classpathentry kind="output" path="bin/classes"/>

 </classpath>

diff --git a/.project b/.project
index 3b27c42..5b798e0 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>AndroidBluetoothGpsProvider</name>

+	<name>AndroidBlueGps4Cupcake</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 14c4d51..0b88c69 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,7 +23,7 @@
       android:versionCode="123"

       android:versionName="@string/versionName">

 

-    <uses-sdk android:targetSdkVersion="5" android:minSdkVersion="5" />

+    <uses-sdk android:targetSdkVersion="4" android:minSdkVersion="3" />

     

 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

@@ -31,6 +31,16 @@
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

 	<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />

 	

+	<!-- begin backport.android.bluetooth -->

+	

+	<uses-permission android:name="android.permission.BLUETOOTH"></uses-permission>

+	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"></uses-permission>

+	

+	<!-- ${your package name}.PERMISSION -->

+	<uses-permission android:name="org.broeuschmeul.android.gps.bluetooth.provider.PERMISSION"></uses-permission>

+

+	<!-- end backport.android.bluetooth -->

+

     <application android:icon="@drawable/ic_launcher_bluegps" android:label="@string/app_name" android:allowClearUserData="true">

         <activity android:name=".BluetoothGpsActivity"

                   android:label="@string/app_name"

@@ -64,5 +74,56 @@
 			</intent-filter>			

 		</service>

 

+		<!-- begin backport.android.bluetooth -->

+		

+		<activity android:name="backport.android.bluetooth.RequestEnableActivity"

+			android:label="Bluetooth Permission Request" android:noHistory="true"

+			android:theme="@android:style/Theme.Translucent.NoTitleBar"

+			android:configChanges="orientation|keyboardHidden">

+		    <intent-filter>

+		

+		      <!-- ${your package name}.action.REQUEST_ENABLE -->

+		      <action android:name="org.broeuschmeul.android.gps.bluetooth.provider.action.REQUEST_ENABLE" />

+		

+		      <category android:name="android.intent.category.DEFAULT" />

+		    </intent-filter>

+		</activity>

+		

+		

+		<activity android:name="backport.android.bluetooth.RequestDiscoverableActivity"

+			android:label="Bluetooth Permission Request" android:noHistory="true"

+			android:theme="@android:style/Theme.Translucent.NoTitleBar"

+			android:configChanges="orientation|keyboardHidden">

+		    <intent-filter>

+		

+		      <!-- ${your package name}.action.REQUEST_DISCOVERABLE -->

+		      <action android:name="org.broeuschmeul.android.gps.bluetooth.provider.action.REQUEST_DISCOVERABLE" />

+		

+		      <category android:name="android.intent.category.DEFAULT" />

+		    </intent-filter>

+		</activity>

+		

+		

+		<receiver android:name="backport.android.bluetooth.BluetoothIntentRedirector">

+			<intent-filter>

+			  <action android:name="android.bluetooth.intent.action.DISCOVERY_COMPLETED" />

+			  <action android:name="android.bluetooth.intent.action.DISCOVERY_STARTED" />

+			  <action android:name="android.bluetooth.intent.action.NAME_CHANGED" />

+			  <action android:name="android.bluetooth.intent.action.SCAN_MODE_CHANGED" />

+			  <action android:name="android.bluetooth.intent.action.BLUETOOTH_STATE_CHANGED" />

+			  <action android:name="android.bluetooth.intent.action.REMOTE_DEVICE_CONNECTED" />

+			  <action android:name="android.bluetooth.intent.action.REMOTE_DEVICE_DISCONNECTED" />

+			  <action android:name="android.bluetooth.intent.action.REMOTE_DEVICE_DISCONNECT_REQUESTED" />

+			  <action android:name="android.bluetooth.intent.action.BOND_STATE_CHANGED" />

+			  <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" />

+			  <action android:name="android.bluetooth.intent.action.PAIRING_CANCEL" />

+			  <action android:name="android.bluetooth.intent.action.REMOTE_DEVICE_CLASS_UPDATED" />

+			  <action android:name="android.bluetooth.intent.action.REMOTE_DEVICE_FOUND" />

+			  <action android:name="android.bluetooth.intent.action.REMOTE_NAME_UPDATED" />

+			</intent-filter>

+		</receiver>

+

+		<!-- end backport.android.bluetooth -->

+	

     </application>

 </manifest> 

diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 0000000..f3997d3
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,26 @@
+BluetoothGPS4Droid (BlueGPS4Droid)
+Copyright (C) 2010, 2011 Herbert von Broeuschmeul
+Copyright (C) 2010, 2011 BluetoothGPS4Droid Project
+	  
+BluetoothGPS4Droid is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+BluetoothGPS4Droid is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with BluetoothGPS4Droid. If not, see <http://www.gnu.org/licenses/>.
+
+---------------------------------------------------------------------------
+
+Bluetooth support is provided by the backport-android-bluetooth package, 
+which is the backport of the android.bluetooth API, introduced in Android 2.0
+to older Android platforms. The backport-android-bluetooth package is 
+open source software released under the Apache License, Version 2.0. 
+The original software is available from
+	http://code.google.com/p/backport-android-bluetooth/
+
diff --git a/lib/backport-android-bluetooth2.jar b/lib/backport-android-bluetooth2.jar
new file mode 100644
index 0000000..367dca1
--- /dev/null
+++ b/lib/backport-android-bluetooth2.jar
diff --git a/project.properties b/project.properties
index 05c1419..c957743 100644
--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-5
+target=android-4
diff --git a/readme.textile b/readme.textile
index 0d4d5af..906f27f 100644
--- a/readme.textile
+++ b/readme.textile
@@ -1,3 +1,7 @@
+*"BlueGps4Cupcake 1.2.3":http://sourceforge.net/projects/bluegps4droid/files/Apk/BlueGPS4Droid_1.2.x/BlueGps4Cupcake_1.2.3.apk/download* (2011-09-08)

+* BlueGps4Droid version 1.2.3 for Cupcake and Donuts - *Do not use with Eclair, Froyo or Gingerbread !!!*

+* Bluetooth support is provided using the backport-android-bluetooth package:  "http://code.google.com/p/backport-android-bluetooth":http://code.google.com/p/backport-android-bluetooth.

+

 *BlueGps4Droid 1.2.3* (2011-09-08)

 * Add Russian translation (thanks to skleroz)

 

@@ -48,4 +52,4 @@ BlueGps4Droid 1.0 (2010-09-12)
 * Connect to bluetooth GPS (NMEA) and replace the internal GPS of an Android device.

 * Record GPS tracks in NMEA files 

 * Compatible with Android version 2.0 and above

-* English and French translations    
\ No newline at end of file
+* English and French translations    

diff --git a/res/layout/about.xml b/res/layout/about.xml
index 8df16b9..92245f4 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -71,5 +71,16 @@
 			style="@style/about_text"
 			android:text="@string/about_sources"
 		/>
+		<TextView
+			android:id="@+id/about_bluetooth_license"
+			style="@style/about_text"
+			android:text="@string/about_bluetooth_license"
+ 			android:autoLink="none"
+		/>
+		<TextView
+			android:id="@+id/about_bluetooth_sources"
+			style="@style/about_text"
+			android:text="@string/about_bluetooth_sources"
+		/>
 	</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d7d6294..93681bf 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -123,4 +123,10 @@
     <string name="about_sources">Le code source est librement téléchargeable à partir du dépot Git sur le site web du projet : 

 		http://sourceforge.net/p/bluegps4droid

     </string>

+    <string name="about_bluetooth_license">Le support du Bluetooth est fournit par le projet <i>backport-android-bluetooth</i> 

+    	qui le diffuse sous les termes de la <a href="http://www.apache.org/licenses/LICENSE-2.0"><b>Licence Apache, Version 2.0</b></a>.

+    </string>

+    <string name="about_bluetooth_sources">Le code source du portage <i>backport-android-bluetooth</i> est téléchargeable à l\'adresse suivante : 

+		http://code.google.com/p/backport-android-bluetooth

+    </string>

 </resources>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3b1e6a7..1889aec 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -123,4 +123,10 @@
     <string name="about_sources">The source code is available from Git repository on the project website: 

 		http://sourceforge.net/p/bluegps4droid

     </string>

+    <string name="about_bluetooth_license">Bluetooth support is provided by the <i>backport-android-bluetooth package</i>, 

+		which is open source software released under the <a href="http://www.apache.org/licenses/LICENSE-2.0"><b>Apache License, Version 2.0</b></a>.

+    </string>

+    <string name="about_bluetooth_sources">The <i>backport-android-bluetooth package</i> is available from: 

+		http://code.google.com/p/backport-android-bluetooth

+    </string>

 </resources>

diff --git a/res/xml/pref.xml b/res/xml/pref.xml
index c1c21ff..9c869bf 100644
--- a/res/xml/pref.xml
+++ b/res/xml/pref.xml
@@ -16,7 +16,7 @@
 	GNU General Public License for more details.

 	

 	You should have received a copy of the GNU General Public License

-	along with BluetoothGPS4Droid. If not, see : http://www.gnu.org/licenses/.

+	along with BluetoothGPS4Droid. If not, see <http://www.gnu.org/licenses/>..

 -->

 <PreferenceScreen

 	xmlns:android="http://schemas.android.com/apk/res/android"

@@ -88,6 +88,7 @@
 			<CheckBoxPreference

 				android:key="@string/pref_sirf_enable_gga_key"

 				android:enabled="false"

+				android:selectable="false"

 				android:persistent="true"

 				android:defaultValue="true"

 				android:title="@string/pref_enable_gga_title"

@@ -96,6 +97,7 @@
 			<CheckBoxPreference

 				android:key="@string/pref_sirf_enable_rmc_key"

 				android:enabled="false"

+				android:selectable="false"

 				android:persistent="true"

 				android:defaultValue="true"

 				android:title="@string/pref_enable_rmc_title"

@@ -145,6 +147,7 @@
 			<CheckBoxPreference 

 				android:key="@string/pref_sirf_enable_nmea_key"

 				android:enabled="false"

+				android:selectable="false"

 				android:persistent="true"

 				android:defaultValue="true"

 				android:title="@string/pref_enable_nmea_title"

diff --git a/src/backport_android_bluetooth.properties b/src/backport_android_bluetooth.properties
new file mode 100644
index 0000000..72845a9
--- /dev/null
+++ b/src/backport_android_bluetooth.properties
@@ -0,0 +1,8 @@
+#permission_name = ${your package name).PERMISSION_BLUETOOTH

+permission_name = org.broeuschmeul.android.gps.bluetooth.provider.PERMISSION_BLUETOOTH

+

+#request_enable = ${your package name}.action.REQUEST_ENABLE

+request_enable = org.broeuschmeul.android.gps.bluetooth.provider.action.REQUEST_ENABLE

+

+#request_discoverable = ${your package name}.action.REQUEST_DISCOVERABLE

+request_discoverable = org.broeuschmeul.android.gps.bluetooth.provider.action.REQUEST_DISCOVERABLE
\ No newline at end of file
diff --git a/src/org/broeuschmeul/android/gps/bluetooth/provider/BlueetoothGpsManager.java b/src/org/broeuschmeul/android/gps/bluetooth/provider/BlueetoothGpsManager.java
index da76754..39e3514 100644
--- a/src/org/broeuschmeul/android/gps/bluetooth/provider/BlueetoothGpsManager.java
+++ b/src/org/broeuschmeul/android/gps/bluetooth/provider/BlueetoothGpsManager.java
@@ -36,6 +36,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;

 import java.util.concurrent.TimeUnit;

 

+import org.broeuschmeul.android.gps.nmea.util.NmeaListener;

 import org.broeuschmeul.android.gps.nmea.util.NmeaParser;

 import org.broeuschmeul.android.gps.sirf.util.SirfUtils;

 

@@ -43,14 +44,13 @@ import android.app.Notification;
 import android.app.NotificationManager;

 import android.app.PendingIntent;

 import android.app.Service;

-import android.bluetooth.BluetoothAdapter;

-import android.bluetooth.BluetoothDevice;

-import android.bluetooth.BluetoothSocket;

+import backport.android.bluetooth.BluetoothAdapter;

+import backport.android.bluetooth.BluetoothDevice;

+import backport.android.bluetooth.BluetoothSocket;

 import android.content.Context;

 import android.content.SharedPreferences;

 import android.content.Intent;

 import android.location.LocationManager;

-import android.location.GpsStatus.NmeaListener;

 import android.preference.PreferenceManager;

 import android.provider.Settings;

 import android.os.SystemClock;

diff --git a/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java b/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java
index f3b18dc..ca5ef2b 100644
--- a/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java
+++ b/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java
@@ -24,8 +24,8 @@ import java.util.HashSet;
 import java.util.Set;

 

 import android.app.AlertDialog;

-import android.bluetooth.BluetoothAdapter;

-import android.bluetooth.BluetoothDevice;

+import backport.android.bluetooth.BluetoothAdapter;

+import backport.android.bluetooth.BluetoothDevice;

 import android.content.Intent;

 import android.content.SharedPreferences;

 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;

@@ -157,6 +157,11 @@ public class BluetoothGpsActivity extends PreferenceActivity implements OnPrefer
         textView.setTextColor(defaultColor);

         textView = (TextView) messageView.findViewById(R.id.about_sources);

         textView.setTextColor(defaultColor);

+        textView = (TextView) messageView.findViewById(R.id.about_bluetooth_license);

+        textView.setMovementMethod(LinkMovementMethod.getInstance());

+        textView.setTextColor(defaultColor);

+        textView = (TextView) messageView.findViewById(R.id.about_bluetooth_sources);

+        textView.setTextColor(defaultColor);

        

 		AlertDialog.Builder builder = new AlertDialog.Builder(this);

 		builder.setTitle(R.string.about_title);

diff --git a/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsProviderService.java b/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsProviderService.java
index b06d53f..6ad573d 100644
--- a/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsProviderService.java
+++ b/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsProviderService.java
@@ -31,16 +31,19 @@ import java.io.PrintWriter;
 import java.text.SimpleDateFormat;

 import java.util.Date;

 

+import org.broeuschmeul.android.gps.nmea.util.NmeaListener;

+

 import android.app.Notification;

+import android.app.NotificationManager;

 import android.app.PendingIntent;

 import android.app.Service;

-import android.bluetooth.BluetoothAdapter;

+import backport.android.bluetooth.BluetoothAdapter;

+import android.content.Context;

 import android.content.Intent;

 import android.content.SharedPreferences;

 import android.location.Location;

 import android.location.LocationListener;

 import android.location.LocationManager;

-import android.location.GpsStatus.NmeaListener;

 import android.os.Bundle;

 import android.os.IBinder;

 import android.preference.PreferenceManager;

@@ -90,6 +93,7 @@ public class BluetoothGpsProviderService extends Service implements NmeaListener
 	public static final String PREF_SIRF_ENABLE_NMEA = "enableNMEA";

 	public static final String PREF_SIRF_ENABLE_STATIC_NAVIGATION = "enableStaticNavigation";

 

+	private NotificationManager notificationManager = null;

 	private BlueetoothGpsManager gpsManager = null;

 	private PrintWriter writer;

 	private File trackFile;

@@ -99,6 +103,7 @@ public class BluetoothGpsProviderService extends Service implements NmeaListener
 	@Override

 	public void onCreate() {

 		super.onCreate();

+		NotificationManager notificationManager = (NotificationManager)this.getSystemService(Context.NOTIFICATION_SERVICE);

 	    toast = Toast.makeText(getApplicationContext(), "NMEA track recording... on", Toast.LENGTH_SHORT);		

 	}

 

@@ -195,6 +200,58 @@ public class BluetoothGpsProviderService extends Service implements NmeaListener
 		}

 	}

 

+	/**

+	 * The notification id used to signal that this service runs in the foreground.

+	 * 

+	 * @see #startForeground(int, Notification)

+	 * @see #stopForeground(boolean)

+	 */

+	private int notificationId = R.string.foreground_gps_provider_started_notification;

+

+	

+	private NotificationManager getNotificationManager(){

+		if (notificationManager == null){

+			notificationManager = (NotificationManager)this.getSystemService(Context.NOTIFICATION_SERVICE);

+		}

+		return notificationManager;

+	}

+	

+	/**

+	 * Compatibility (see API 5) method used to run this service in the foreground, 

+	 * supplying the ongoing notification to be shown to the user while in this state. 

+	 * 

+	 * @param id	The identifier for this notification as per NotificationManager.notify(int, Notification)

+	 * @param notification	The Notification to be displayed.

+	 * 

+	 * @see #stopForeground(boolean)

+	 */

+	private final void startForeground (int id, Notification notification){

+		NotificationManager notificationManager = this.getNotificationManager();

+		setForeground(true);

+		if (notificationManager != null){

+			notificationManager.notify(notificationId = id, notification);

+		}

+	}

+	

+	/**

+	 * Compatibility (see API 5) method used to remove this service from foreground state, 

+	 * allowing it to be killed if more memory is needed.

+	 * This method should be called with value false, when the service is destroyed.

+	 * 

+	 * @param removeNotification	If true, the notification previously provided 

+	 * 								to startForeground(int, Notification) will be removed. 

+	 * 								Otherwise it will remain until a later call removes it (or the service is destroyed).

+	 * 

+	 * @see #startForeground(int, Notification)

+	 */

+	private final void stopForeground (boolean removeNotification){

+		NotificationManager notificationManager = this.getNotificationManager();

+		if (removeNotification && (notificationManager != null)){

+			notificationManager.cancel(notificationId);

+		}

+		setForeground(false);

+	}

+	

 	private void enableSirfConfig(Bundle extras){

 		if (extras.containsKey(PREF_SIRF_ENABLE_GGA)){

 			enableNmeaGGA(extras.getBoolean(PREF_SIRF_ENABLE_GGA, true));

@@ -380,14 +437,15 @@ public class BluetoothGpsProviderService extends Service implements NmeaListener
 		}

 	}

 

-	/* (non-Javadoc)

-	 * @see android.app.Service#onStartCommand(android.content.Intent, int, int)

-	 */

-	@Override

-	public int onStartCommand(Intent intent, int flags, int startId) {

-		onStart(intent, startId);

-		return Service.START_NOT_STICKY;

-	}

+//  This method has been introduced in Eclair

+//	/* (non-Javadoc)

+//	 * @see android.app.Service#onStartCommand(android.content.Intent, int, int)

+//	 */

+//	@Override

+//	public int onStartCommand(Intent intent, int flags, int startId) {

+//		onStart(intent, startId);

+//		return Service.START_NOT_STICKY;

+//	}

 

 	@Override

 	public void onDestroy() {

@@ -416,6 +474,7 @@ public class BluetoothGpsProviderService extends Service implements NmeaListener
 			edit.putBoolean(PREF_START_GPS_PROVIDER,false);

 			edit.commit();

 		}

+		stopForeground(true);

 		super.onDestroy();

 	}

 

diff --git a/src/org/broeuschmeul/android/gps/nmea/util/NmeaListener.java b/src/org/broeuschmeul/android/gps/nmea/util/NmeaListener.java
new file mode 100644
index 0000000..f36a312
--- /dev/null
+++ b/src/org/broeuschmeul/android/gps/nmea/util/NmeaListener.java
@@ -0,0 +1,12 @@
+/**

+ * 

+ */

+package org.broeuschmeul.android.gps.nmea.util;

+

+/**

+ * @author Herbert von Broeuschmeul

+ *

+ */

+public interface NmeaListener {

+	abstract void onNmeaReceived(long timestamp, String nmea);

+}

diff --git a/version.txt b/version.txt
index 0c172af..8101b84 100644
--- a/version.txt
+++ b/version.txt
@@ -1,6 +1,14 @@
+BlueGps4Cupcake 1.2.3 (2011-09-08)

+	* BlueGps4Droid version 1.2.3 for Cupcake and Donuts - Do not use with Eclair, Froyo or Gingerbread !!!

+	* Bluetooth support is provided using the backport-android-bluetooth package: http://code.google.com/p/backport-android-bluetooth.

+

 BlueGps4Droid 1.2.3 (2011-09-08)

 	* Add Russian translation (thanks to skleroz)

 

+BlueGps4Cupcake 1.2.2 (2011-05-24)

+	* BlueGps4Droid version 1.2.2 for Cupcake and Donuts - Do not use with Eclair, Froyo or Gingerbread !!!

+	* Bluetooth support is provided using the backport-android-bluetooth package: http://code.google.com/p/backport-android-bluetooth.

+

 BlueGps4Droid 1.2.2 (2011-05-14)

 	* Add an option to force auto-activation of the chosen location provider (useful when the device defines a GPS provider but doesn't provide the preferences used to enable/disable it).

 	* Update copyright infos.

@@ -48,4 +56,4 @@ BlueGps4Droid 1.0 (2010-09-12)
 	* Connect to bluetooth GPS (NMEA) and replace the internal GPS of an Android device.

 	* Record GPS tracks in NMEA files 

 	* Compatible with Android version 2.0 and above

-	* English and French translations    
+	* English and French translations