From d05a77992df983b9fa79f0e2b20d2c6b387c180c Mon Sep 17 00:00:00 2001
From: Mike Beattie <mike@ethernal.org>
Date: Tue, 29 Jan 2013 01:34:48 +1300
Subject: [PATCH] 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>
---
 altosdroid/AndroidManifest.xml                   |   2 +-
 altosdroid/Makefile.am                           |   9 +++++++++
 altosdroid/release.keystore                      | Bin 0 -> 1243 bytes
 .../org/altusmetrum/AltosDroid/AltosDroid.java   |   4 ++--
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 altosdroid/release.keystore

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 0000000000000000000000000000000000000000..53607dcb05748267514a837c3e100345f5e1ebaa
GIT binary patch
literal 1243
zcmezO_TO6u1_mY|W&~rd#GI1+;*_HN%oL!IO~aMmc|f|~poy{DfRBw!n~jl$QHx2C
zk&%^wrHQee>8O_9U!U(QqmK!i_J+im-s{p|6<&4QWI~<nmyBiIr>?VU@9LV($zpO$
zvQwy8IMLwcu@zDg>7V&_9hUCg{jB@CWLWtVtCc%l-CI*X@xPE>IzJ+Gbxma0#Nx#l
z{bu_gdiD3OG=ss@`uM9|`Z|$s?iBC+{%AeRle7xC`HwDsRXzUUt-J8kv&*@oBhR}R
za-Ca{Sj8k{_cc`T%N7wAr!O!4w{Ux^>=o8Ezm{1U!`kWIk@YU_j05}nwC9aIH6G%8
zGk5A-En<r}cT{EL<Xz%d6@R_W{e4ZW`f=bXt_}TanH#roZ+6&m_3Ex|LRt0tJ~ftF
z8l}m*vgITqD>#C#zFm^|LcG6xvAU4g!5=reYu+R|%3tU?`YCGF^%TQ>a|G9(ls)6C
zcrJOvL0-|R|JA=JZfRbAD0B4<Uv{61YKt3${pGfs9ZXNXGOx!&iOros&wCZC_ld@{
z{!?3*ci*vm+qaRcBIsej2|<_Qy5ml(CHm*xWZ_?aa?SkbeT%_S#Tub!YGBF0z|3gS
z#Pk=4cQ0UOVq{`s31o|QHQ;7r*J|@PXTieE%3zRW$Zf#M#vIDRCd?EXY$#~J58`kL
zb2#Vc<QFBT<Qs|_2!n*!g?XHE5|gtP-13W3i%See41_?!T*BOrIVGjVzNsZerMZT}
z27(|_W??R%XnwH^D76^KiSrs78yFf{7#bRw7@J3l^BS7~xyDc~UEI*bxE+{Mbzoix
z1`MM-Q)45;-}>N2*-|0Rp!;5P^xiyq{!MUukj;A+hQo694ch|MGF@XGlmdT8+V)2L
z+JE%xE`x8UXNTroZ?tZZHOc>!masj0X28-V^XI={sTNQ=<iC66^?%!sN&m18e|~Jm
zGEsh(-_74HAC)`IWEvtIB{tFMTj}R@+KJb--hWbJmYjRhgYh_%D8uxGfPPVB?lYSv
z?QB}~x`q2ggv?iv)4o4k(0XmQ?Y+}`R>zp_2;W&bW&Q47R<D|VhWl{avNxp%Muzw8
zx)SOCtdL!xv0;m+SfTO@9}O|#?dLg-dQL2RXd_nD9a7V)@nG>fIql8MN+;$muIK)x
zXqxo#cTyFjiuIW#ANQ>YoY1+V`ToPGr}Nn+b*IHOREMgjF#1^kJMXE*+}Ogv)Y!nv
zuDEK!`KDbfFZ)E5Cn%TuNw)ckr}!LTI<Z|}ymH3prw19EJvih%K3)ItsVcMQe+G}a
z(FFC$ItMq(#s7S|d~Ov3>nz>|TZzdrhxHb2UU*FW__s+%Oy8{WYqI{7@hr8w)pveN
z`+Sc~dzN?i-p-KwFYl`9BfR0d*S;=`T!Ajf?I`J$S)ai`he@QW+-lQxxjL_V!F<=w
zvRlc>EK(I@60vuw4>6CdIVbV3`k1E2TEWEPf={|(7dw{T`^6qRHLCL%|5S^Z(!fFh
DyZY+c

literal 0
HcmV?d00001

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;
 			}
 		}
-- 
2.30.2