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 7147c0b1ef919da0507c3cd515118eab9118dab8..8ecfcbb52e0a3f7d259a123debca1720f4430ec5 100644 (file)
--- 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 3860e110b1804357e8f070e792280852aa39f175..3b5abfc4c3dde1884e59121c6f3e4e133bb2c309 100644 (file)
--- 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 (file)
index 0000000..53607dc
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 ab1fb0dee09f837cf56df1b4ddb00efc8c550337..7f98e7f6266fb4de707009155063f0cb6bb95577 100644 (file)
--- 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;
                        }
                }