summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Beattie <mike@ethernal.org>2013-01-29 01:34:48 +1300
committerMike Beattie <mike@ethernal.org>2013-01-29 01:34:48 +1300
commitd05a77992df983b9fa79f0e2b20d2c6b387c180c (patch)
treec5fc02d11aaff4507cc9044206e252d505b7a9d8
parent3454592169dcb61b81de9af2b631b87e7dd86231 (diff)
altosdroid: initial release to Play Storealtosdroid_v1.1.9.3
* 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>
-rw-r--r--altosdroid/AndroidManifest.xml2
-rw-r--r--altosdroid/Makefile.am9
-rw-r--r--altosdroid/release.keystorebin0 -> 1243 bytes
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java4
4 files changed, 12 insertions, 3 deletions
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
--- /dev/null
+++ b/altosdroid/release.keystore
Binary files 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;
}
}