Commit 8799b498 authored by Matej Frančeškin's avatar Matej Frančeškin

Taisync - remove probing timer, use onResume as plug in detection event

parent 9c6b1ea7
...@@ -225,13 +225,21 @@ public class QGCActivity extends QtActivity ...@@ -225,13 +225,21 @@ public class QGCActivity extends QtActivity
IntentFilter accessoryFilter = new IntentFilter(ACTION_USB_PERMISSION); IntentFilter accessoryFilter = new IntentFilter(ACTION_USB_PERMISSION);
filter.addAction(UsbManager.ACTION_USB_ACCESSORY_DETACHED); filter.addAction(UsbManager.ACTION_USB_ACCESSORY_DETACHED);
registerReceiver(mOpenAccessoryReceiver, accessoryFilter); registerReceiver(mOpenAccessoryReceiver, accessoryFilter);
probeAccessories(); probeAccessories();
} catch(Exception e) { } catch(Exception e) {
Log.e(TAG, "Exception: " + e); Log.e(TAG, "Exception: " + e);
} }
} }
@Override
public void onResume() {
super.onResume();
// Plug in of USB ACCESSORY triggers only onResume event.
// Then we scan if there is actually anything new
probeAccessories();
}
@Override @Override
protected void onDestroy() protected void onDestroy()
{ {
...@@ -701,14 +709,11 @@ public class QGCActivity extends QtActivity ...@@ -701,14 +709,11 @@ public class QGCActivity extends QtActivity
private void probeAccessories() private void probeAccessories()
{ {
final PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0); final PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0);
Timer timer = new Timer(); new Thread(new Runnable() {
timer.schedule(new TimerTask() { public void run() {
@Override Log.i(TAG, "probeAccessories");
public void run() UsbAccessory[] accessories = _usbManager.getAccessoryList();
{ if (accessories != null) {
// Log.i(TAG, "probeAccessories");
UsbAccessory[] accessories = _usbManager.getAccessoryList();
if (accessories != null) {
for (UsbAccessory usbAccessory : accessories) { for (UsbAccessory usbAccessory : accessories) {
if (_usbManager.hasPermission(usbAccessory)) { if (_usbManager.hasPermission(usbAccessory)) {
openAccessory(usbAccessory); openAccessory(usbAccessory);
...@@ -717,9 +722,9 @@ public class QGCActivity extends QtActivity ...@@ -717,9 +722,9 @@ public class QGCActivity extends QtActivity
_usbManager.requestPermission(usbAccessory, pendingIntent); _usbManager.requestPermission(usbAccessory, pendingIntent);
} }
} }
} }
} }
}, 0, 3000); }).start();
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment