X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroidTab.java;h=11d8f6241fc885b1b140696c803a78753e3b4b77;hp=f91ddf58b6f8f6e98ea8402da35e039a09369e3a;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=cb23b992be8ba40c97d8988c134a814a13ccd58c

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index f91ddf58..11d8f624 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.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_7.*;
+import org.altusmetrum.altoslib_11.*;
 import android.location.Location;
 import android.app.Activity;
 import android.graphics.Color;
@@ -26,21 +27,22 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.FragmentManager;
 import android.location.Location;
-import android.util.Log;
 import android.widget.TextView;
 
 public abstract class AltosDroidTab extends Fragment implements AltosUnitsListener {
+	TelemetryState		last_telem_state;
 	AltosState		last_state;
 	AltosGreatCircle	last_from_receiver;
 	Location		last_receiver;
+	AltosDroid		altos_droid;
 
-	public abstract void show(AltosState state, AltosGreatCircle from_receiver, Location receiver);
+	public abstract void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver);
 
 	public abstract String tab_name();
 
 	public void units_changed(boolean imperial_units) {
-		if (!isHidden() && last_state != null)
-			show(last_state, last_from_receiver, last_receiver);
+		if (!isHidden())
+			show(last_telem_state, last_state, last_from_receiver, last_receiver);
 	}
 
 	public void set_value(TextView text_view,
@@ -55,24 +57,45 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
 
 	public void set_visible(boolean visible) {
 		FragmentTransaction	ft = AltosDroid.fm.beginTransaction();
+		AltosDebug.debug("set visible %b %s\n", visible, tab_name());
 		if (visible) {
-			AltosState		state = last_state;
-			AltosGreatCircle	from_receiver = last_from_receiver;
-			Location		receiver = last_receiver;
-
-			show(state, from_receiver, receiver);
 			ft.show(this);
+			show(last_telem_state, last_state, last_from_receiver, last_receiver);
 		} else
 			ft.hide(this);
 		ft.commitAllowingStateLoss();
 	}
 
-	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver, boolean is_current) {
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+		altos_droid = (AltosDroid) activity;
+		altos_droid.registerTab(this);
+	}
+
+	@Override
+	public void onDetach() {
+		super.onDetach();
+		altos_droid.unregisterTab(this);
+		altos_droid = null;
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		AltosDebug.debug("onResume tab %s\n", tab_name());
+		set_visible(true);
+	}
+
+	public void update_ui(TelemetryState telem_state, AltosState state,
+			      AltosGreatCircle from_receiver, Location receiver, boolean is_current)
+	{
+		last_telem_state = telem_state;
 		last_state = state;
 		last_from_receiver = from_receiver;
 		last_receiver = receiver;
 		if (is_current)
-			show(state, from_receiver, receiver);
+			show(telem_state, state, from_receiver, receiver);
 		else
 			return;
 	}