Merge remote-tracking branch 'mjb/master'

diff --combined altosdroid/Makefile.am
index cc74b7a85395b817e653792cdaec4d048ebe9cd0,3b5abfc4c3dde1884e59121c6f3e4e133bb2c309..39f3c2b6a48439d82a08811c012ea778fa2f99d8
--- 1/altosdroid/Makefile.am
--- 2/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@@ -17,7 -17,7 +17,7 @@@ ZIPALIGN=$(SDK)/tools/zipalig
  SRC_DIR=src/org/altusmetrum/AltosDroid
  EXT_LIBDIR=libs
  ALTOSLIB_SRCDIR=../altoslib
 -ALTOSLIB_JAR=AltosLib.jar
 +ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar
  
  ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR)
  
@@@ -54,12 -54,18 +54,21 @@@ bin/AltosDroid-debug.apk: $(SRC) $(ALTO
  
  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:
 +clean: clean-local
        $(clean_command)
  
 +clean-local:
 +      rm -rf $(EXT_LIBDIR)
 +
  .PHONY: $(SRC_DIR)/BuildInfo.java

diff --combined altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index fe4907dd584f700727afc1e4a07d27ad151b0777,7f98e7f6266fb4de707009155063f0cb6bb95577..caa1a1c5a7c80b73639ea1b5c149f87bd3fbcf96
--- 1/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
--- 2/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@@ -43,7 -43,7 +43,7 @@@ import android.widget.TextView
  import android.widget.Toast;
  import android.app.AlertDialog;
  
 -import org.altusmetrum.AltosLib.*;
 +import org.altusmetrum.altoslib_1.*;
  
  /**
   * This is the main Activity that displays the current chat session.
@@@ -119,7 -119,7 +119,7 @@@ public class AltosDroid extends Activit
                                        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 +135,7 @@@
                        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;
                        }
                }