From f37d9e8516caadbbddb4d40fd2447d93ef48435b Mon Sep 17 00:00:00 2001
From: Chet Henry <henry@visionlink.org>
Date: Fri, 28 Nov 2014 19:49:58 -0700
Subject: [PATCH] Fix problems and wait a bit for ant+ pairing

---
 contrib/RideLogger/res/xml/ant_settings.xml   |  2 +-
 .../DynamicMultiSelectListPreference.java     | 24 -------------
 .../src/com/ridelogger/RideService.java       |  2 +-
 .../src/com/ridelogger/SettingsActivity.java  | 34 ++++++++++++++++---
 4 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 contrib/RideLogger/src/com/ridelogger/DynamicMultiSelectListPreference.java

diff --git a/contrib/RideLogger/res/xml/ant_settings.xml b/contrib/RideLogger/res/xml/ant_settings.xml
index 99e28daa0..d0ad82742 100644
--- a/contrib/RideLogger/res/xml/ant_settings.xml
+++ b/contrib/RideLogger/res/xml/ant_settings.xml
@@ -3,7 +3,7 @@
         <PreferenceCategory
             android:title="@string/PREFS_NAME">
 
-        <com.ridelogger.DynamicMultiSelectListPreference
+        <MultiSelectListPreference
             android:key="@string/PREF_PAIRED_ANTS"
             android:title="@string/ant_pair_dialog_title"
             android:summary="@string/ant_pair_dialog_button_note"
diff --git a/contrib/RideLogger/src/com/ridelogger/DynamicMultiSelectListPreference.java b/contrib/RideLogger/src/com/ridelogger/DynamicMultiSelectListPreference.java
deleted file mode 100644
index 845c71336..000000000
--- a/contrib/RideLogger/src/com/ridelogger/DynamicMultiSelectListPreference.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ridelogger;
-
-import android.preference.MultiSelectListPreference;
-import android.util.AttributeSet;
-import android.app.Dialog;
-import android.content.Context;
-
-public class DynamicMultiSelectListPreference extends MultiSelectListPreference {
-    public DynamicMultiSelectListPreference(Context context) {
-        super(context);
-    }
-    
-    public DynamicMultiSelectListPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public void refresh() {
-        Dialog test = getDialog();
-        if(test != null && test.isShowing()) {
-            test.dismiss();
-            showDialog(null);
-        }
-    }
-}
\ No newline at end of file
diff --git a/contrib/RideLogger/src/com/ridelogger/RideService.java b/contrib/RideLogger/src/com/ridelogger/RideService.java
index 9fe723706..d73447b80 100644
--- a/contrib/RideLogger/src/com/ridelogger/RideService.java
+++ b/contrib/RideLogger/src/com/ridelogger/RideService.java
@@ -231,7 +231,7 @@ public class RideService extends Service
                 sensors.put("GPS",            new Gps(this));
                 sensors.put("AndroidSensors", new Sensors(this));
                 
-                if(!pairedAnts.isEmpty()){
+                if(pairedAnts != null && !pairedAnts.isEmpty()){
                     mCallback = new MultiDeviceSearch.SearchCallbacks(){
                         public void onDeviceFound(final MultiDeviceSearchResult deviceFound)
                         {
diff --git a/contrib/RideLogger/src/com/ridelogger/SettingsActivity.java b/contrib/RideLogger/src/com/ridelogger/SettingsActivity.java
index 7e4e5601f..1a1e74680 100644
--- a/contrib/RideLogger/src/com/ridelogger/SettingsActivity.java
+++ b/contrib/RideLogger/src/com/ridelogger/SettingsActivity.java
@@ -1,8 +1,11 @@
 package com.ridelogger;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import com.dsi.ant.plugins.antplus.pcc.defines.DeviceType;
 import com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult;
@@ -10,6 +13,10 @@ import com.dsi.ant.plugins.antplus.pccbase.MultiDeviceSearch;
 import com.dsi.ant.plugins.antplus.pccbase.MultiDeviceSearch.MultiDeviceSearchResult;
 
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.RemoteException;
+import android.preference.MultiSelectListPreference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 
@@ -40,7 +47,7 @@ public class SettingsActivity extends PreferenceActivity {
      */
     public static class AntFragment extends PreferenceFragment {
         private MultiDeviceSearch mSearch;
-        private DynamicMultiSelectListPreference mMultiSelectListPreference;
+        private MultiSelectListPreference mMultiSelectListPreference;
 
         
         @Override
@@ -48,9 +55,28 @@ public class SettingsActivity extends PreferenceActivity {
             super.onCreate(savedInstanceState);
             
             addPreferencesFromResource(R.xml.ant_settings);
-            mMultiSelectListPreference = (DynamicMultiSelectListPreference) findPreference(getString(R.string.PREF_PAIRED_ANTS));            
-            
+            mMultiSelectListPreference = (MultiSelectListPreference) findPreference(getString(R.string.PREF_PAIRED_ANTS));
+            mMultiSelectListPreference.setEnabled(false);
+
             setupAnt();
+
+            Timer timer = new Timer();
+            final Handler handler = new Handler();
+            
+            timer.schedule(
+                new TimerTask() {
+                    @Override  
+                    public void run() {
+                        handler.post(new Runnable() {
+    
+                            public void run() {
+                                mMultiSelectListPreference.setEnabled(true);
+                            }
+                        });
+                    }
+                },
+                5000
+            );      
         }
 
         /**
@@ -110,8 +136,6 @@ public class SettingsActivity extends PreferenceActivity {
                     foundDevicesValues.toArray(new CharSequence[foundDevicesValues.size()])
                 );
             }
-            
-            mMultiSelectListPreference.refresh();
         }
         
         @Override