# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1572359158 25200
# Node ID 11c79d847892b557e374b7df012ceb950dc8803c
# Parent  6cfe062ab65f08143f1e8bd9e4c2f4aaabd0c141# Parent  3a83f40439d7f86501c5de980fa4ab9524a1f0d5
merge

diff -r 6cfe062ab65f -r 11c79d847892 Makefile
--- a/Makefile	Sun Oct 20 15:02:29 2019 -0700
+++ b/Makefile	Tue Oct 29 07:25:58 2019 -0700
@@ -3,7 +3,7 @@
 
 na=$(shell find . -iname '*.c' -o -iname '*.h' -o -iname '*.cpp')
 style:=release
-dest:=/run/user/1000/gvfs/mtp*/*torage/Download
+dest:=../ASM/Installers
 ver:=$(shell grep versionName app/src/main/AndroidManifest.xml | cut -d'"' -f2)
 apk:='app/build/outputs/apk/510Connectbot-$(ver).$(style).apk'
 id:=$(shell hg id --id || echo 1)
@@ -31,7 +31,8 @@
 builder: clean prep
 	ANDROID_HOME=/home/carl/Android/Sdk ANDROID_NDK_HOME=/home/carl/Android/Sdk/ndk-bundle ./gradlew $(task)
 	mv app/build/outputs/apk/arm/$(style)/app-arm-$(style).apk $(apk)
-	ls -al app/build/outputs/apk
+	cp $(apk) $(dest)
+	ls -al $(dest)
 
 clean:
 	rm -rf app/build/*
@@ -48,10 +49,6 @@
 	(cd xml; make)
 	(cd help; make)
 
-install:
-	cp $(apk) $(dest)
-	ls -al $(apk) $(dest)
-
 buildicon:
 	convert base.510.icon.png -background white -resize 500x500 -extent 1024x500 google.play.store/feature.510.icon.png
 	cp -a   base.510.icon.png                 app/src/main/res/drawable-xxxhdpi/icon.png
@@ -117,3 +114,11 @@
 
 internaldocs:
 	doxygen
+
+
+build.asm.packages:
+	make builder style=release
+	hg revert --no-backup app/src/main/res/values/version.xml
+	#
+	make builder style=debug
+	hg revert --no-backup app/src/main/res/values/version.xml
diff -r 6cfe062ab65f -r 11c79d847892 app/src/main/AndroidManifest.xml
--- a/app/src/main/AndroidManifest.xml	Sun Oct 20 15:02:29 2019 -0700
+++ b/app/src/main/AndroidManifest.xml	Tue Oct 29 07:25:58 2019 -0700
@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.five_ten_sg.connectbot"
-	android:versionName="1.9.3-9"
-	android:versionCode="1939"
+	android:versionName="1.9.4-0"
+	android:versionCode="1940"
 	android:installLocation="auto">
 
     <!--  permissions must match HostListActivity.java -->
diff -r 6cfe062ab65f -r 11c79d847892 app/src/main/java/com/five_ten_sg/connectbot/service/TerminalMonitor.java
--- a/app/src/main/java/com/five_ten_sg/connectbot/service/TerminalMonitor.java	Sun Oct 20 15:02:29 2019 -0700
+++ b/app/src/main/java/com/five_ten_sg/connectbot/service/TerminalMonitor.java	Tue Oct 29 07:25:58 2019 -0700
@@ -286,7 +286,7 @@
         keymap.put(0x85, vt320.KEY_F22);         // vk_f22
         keymap.put(0x86, vt320.KEY_F23);         // vk_f23
         keymap.put(0x87, vt320.KEY_F24);         // vk_f24
-        if (target == "localhost") {
+        if (target.equals("localhost")) {
             // bind to the monitor service for localhost connections
             Intent intent = new Intent("com.five_ten_sg.connectbot.monitor.MonitorService");
             intent.setPackage("com.five_ten_sg.connectbot.monitor");