From: Mike Beattie <mike@ethernal.org>
Date: Mon, 28 Jan 2013 12:34:48 +0000 (+1300)
Subject: altosdroid: initial release to Play Store
X-Git-Tag: altosdroid_v1.2-1~121^2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=d05a77992df983b9fa79f0e2b20d2c6b387c180c

altosdroid: initial release to Play Store

* Add release keystore (encrypted)
* Turn off debugging in UI
* add 'sign' target to Makefile.am
* Update version string in AndroidManifest.xml to match released version of altosui.

Signed-off-by: Mike Beattie <mike@ethernal.org>
---

diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml
index 7147c0b1..8ecfcbb5 100644
--- a/altosdroid/AndroidManifest.xml
+++ b/altosdroid/AndroidManifest.xml
@@ -18,7 +18,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.altusmetrum.AltosDroid"
       android:versionCode="1"
-      android:versionName="1.0">
+      android:versionName="1.1.9.3">
     <uses-sdk android:targetSdkVersion="10" android:minSdkVersion="10"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 3860e110..3b5abfc4 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -54,6 +54,15 @@ bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB)
 
 bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB)
 	ant release
+
+sign:
+	jarsigner -keystore release.keystore \
+	   -signedjar bin/AltosDroid-release-signed.apk \
+	   bin/AltosDroid-release-unsigned.apk AltosDroid
+	$(SDK)/tools/zipalign -f 4 \
+	   bin/AltosDroid-release-signed.apk \
+	   bin/AltosDroid-release.apk
+
 endif
 
 clean:
diff --git a/altosdroid/release.keystore b/altosdroid/release.keystore
new file mode 100644
index 00000000..53607dcb
Binary files /dev/null and b/altosdroid/release.keystore differ
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index ab1fb0de..7f98e7f6 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -119,7 +119,7 @@ public class AltosDroid extends Activity {
 					Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
 					ad.mAltosVoice.speak("Connected");
 					//TEST!
-					ad.mTextView.setText(Dumper.dump(ad.mConfigData));
+					//ad.mTextView.setText(Dumper.dump(ad.mConfigData));
 					break;
 				case TelemetryService.STATE_CONNECTING:
 					ad.mTitle.setText(R.string.title_connecting);
@@ -135,7 +135,7 @@ public class AltosDroid extends Activity {
 			case MSG_TELEMETRY:
 				ad.update_ui((AltosState) msg.obj);
 				// TEST!
-				ad.mTextView.setText(Dumper.dump(msg.obj));
+				//ad.mTextView.setText(Dumper.dump(msg.obj));
 				break;
 			}
 		}