X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroidTab.java;h=9594f85fa44c2b0d7876ea11246342fbf0dbdb2e;hb=7eb475a9694327809b7ab5a9f419d00e0819a47d;hp=6a71021c42e837653da39bc6d4b07cf68f3d5c95;hpb=de785b409e404a5296a7ff2037f52f3029536f28;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java index 6a71021c..9594f85f 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_13.*; import android.location.Location; import android.app.Activity; import android.graphics.Color; @@ -39,9 +40,6 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen public abstract String tab_name(); - public void set_map_type(int map_type) { - } - public void units_changed(boolean imperial_units) { if (!isHidden()) show(last_telem_state, last_state, last_from_receiver, last_receiver); @@ -65,7 +63,10 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen show(last_telem_state, last_state, last_from_receiver, last_receiver); } else ft.hide(this); - ft.commitAllowingStateLoss(); + try { + ft.commitAllowingStateLoss(); + } catch (IllegalStateException ie) { + } } @Override