Bump java library versions

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index 7c12c9a0972d7b8453a6203a50dc3d36da22c12c..7ab701472bca37208d7bdb177b41266e46346548 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -17,7 +17,7 @@
 package org.altusmetrum.AltosDroid;
 
 import android.content.Context;
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_6.*;
 
 public class AltosDroidPreferences extends AltosPreferences {
 
@@ -27,9 +27,12 @@ public class AltosDroidPreferences extends AltosPreferences {
        static String active_device_address;
 
        public static void init(Context context) {
+               if (backend != null)
+                       return;
+
                AltosPreferences.init(new AltosDroidPreferencesBackend(context));
 
-               active_device_address = backend.getGetString(activeDevicePreference, null);
+               active_device_address = backend.getString(activeDevicePreference, null);
        }
 
        public static void set_active_device(String address) {