Switch from GPLv2 to GPLv2+

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TabPad.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 4d04316f6f626c7eb6b09f4d64a7f3bd8fbbc048..492f7f5f4585c61dffb703c5189fd4802423bbd2 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +18,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altoslib_11.*;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -191,9 +192,9 @@ public class TabPad extends AltosDroidTab {
                        }
 
                        if (state.flight != 0) {
-                               if (state.state <= AltosLib.ao_flight_pad)
+                               if (state.state() <= AltosLib.ao_flight_pad)
                                        data_logging_view.setText("Ready to record");
-                               else if (state.state < AltosLib.ao_flight_landed)
+                               else if (state.state() < AltosLib.ao_flight_landed)
                                        data_logging_view.setText("Recording data");
                                else
                                        data_logging_view.setText("Recorded data");