X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosUsb.java;h=ad47707d90c9706d3bba397ca384cb66dfac7974;hb=4b3ccb73a26f91917d327558295506ce3c02d684;hp=c2ef8a700ce026fddbf37a68dd498ba01cc059f4;hpb=52149fd81df45f37f5097850795f290f463c43ef;p=fw%2Faltos

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosUsb.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosUsb.java
index c2ef8a70..ad47707d 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosUsb.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosUsb.java
@@ -134,7 +134,6 @@ public class AltosUsb extends AltosDroidLink {
 
 		if (want_product == AltosLib.product_basestation)
 			return have_product == AltosLib.product_teledongle ||
-				have_product == AltosLib.product_teleterra ||
 				have_product == AltosLib.product_telebt ||
 				have_product == AltosLib.product_megadongle;
 
@@ -144,7 +143,8 @@ public class AltosUsb extends AltosDroidLink {
 				have_product == AltosLib.product_easymega ||
 				have_product == AltosLib.product_telegps ||
 				have_product == AltosLib.product_easymini ||
-				have_product == AltosLib.product_telemini;
+				have_product == AltosLib.product_telemini ||
+				have_product == AltosLib.product_easytimer;
 
 		if (have_product == AltosLib.product_altusmetrum)	/* old devices match any request */
 			return true;
@@ -210,12 +210,16 @@ public class AltosUsb extends AltosDroidLink {
 	}
 
 	int read(byte[] buffer, int len) {
+		if (connection == null)
+			return 0;
 		int ret = connection.bulkTransfer(in, buffer, len, -1);
 		AltosDebug.debug("read(%d) = %d\n", len, ret);
 		return ret;
 	}
 
 	int write(byte[] buffer, int len) {
+		if (connection == null)
+			return 0;
 		int ret = connection.bulkTransfer(out, buffer, len, -1);
 		AltosDebug.debug("write(%d) = %d\n", len, ret);
 		return ret;