* Revert: Fix a potential handler leak

* Disable preference when no sensor is found

app/src/main/java/org/thecongers/mtpms/MainActivity.java

@@ -100,8 +100,8 @@ public class MainActivity extends ActionBarActivity {
     static boolean hasSensor = false;
     static SensorIdDatabase sensorDB;
     private LogData logger = null;
+    private Handler sensorMessages;
     private ConnectThread btConnectThread;
-    private Handler handler;
 
     @SuppressLint("HandlerLeak")
     @Override
@@ -204,8 +204,7 @@ public void onCreate(Bundle savedInstanceState) {
             new AlertDialog.Builder(this).setTitle(R.string.alert_setup_title).setMessage(R.string.alert_setup_message).setNeutralButton(R.string.alert_setup_button, null).show();
         }
 
-        IStaticHandler sensorMessages = new IStaticHandler() {
-            @Override
+        sensorMessages = new Handler() {
             public void handleMessage(Message msg) {
                 switch (msg.what) {
                     case RECEIVE_MESSAGE:
@@ -420,7 +419,6 @@ public void handleMessage(Message msg) {
                 }
             }
         };
-        handler = StaticHandlerFactory.create(sensorMessages);
         // Light Sensor Stuff
         SensorManager sensorManager
                 = (SensorManager)getSystemService(Context.SENSOR_SERVICE);
@@ -778,8 +776,7 @@ public void run() {
                 try {
                     // Read from the InputStream
                     bytes = btInStream.read(buffer); // Get number of bytes and message in "buffer"
-
-                    handler.obtainMessage(RECEIVE_MESSAGE, bytes, -1, buffer).sendToTarget(); // Send to message queue Handler
+                    sensorMessages.obtainMessage(RECEIVE_MESSAGE, bytes, -1, buffer).sendToTarget(); // Send to message queue Handler
                 } catch (IOException e) {
                     Log.d(TAG, "IO Exception while reading stream");
                     btConnectThread.cancel();

app/src/main/java/org/thecongers/mtpms/UserSettingActivity.java

@@ -44,6 +44,7 @@ public void onCreate(final Bundle savedInstanceState)
             // Disable auto night mode option when no sensor is found
             if (!MainActivity.hasSensor){
                 getPreferenceScreen().findPreference("prefAutoNightMode").setEnabled(false);
+                getPreferenceScreen().findPreference("prefAutoNightModeDelay").setEnabled(false);
             }
             // Dynamically populate sensorID lists
             final ListPreference listFrontIDPreference = (ListPreference) findPreference("prefFrontID");