OmniJaws: Clean up unused imports, simpify few things
Change-Id: I6e0c42db1e70e17d7c076287254a72f49d82c6ea
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index cf7cc2b..32d7b8f 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -45,6 +45,6 @@
<item>2</item>
<item>4</item>
<item>6</item>
- <item>12</item>
- </string-array>
+ <item>12</item>
+ </string-array>
</resources>
diff --git a/src/org/omnirom/omnijaws/CustomLocationPreference.java b/src/org/omnirom/omnijaws/CustomLocationPreference.java
index 69af007..69253d3 100644
--- a/src/org/omnirom/omnijaws/CustomLocationPreference.java
+++ b/src/org/omnirom/omnijaws/CustomLocationPreference.java
@@ -16,22 +16,14 @@
package org.omnirom.omnijaws;
-import java.util.HashSet;
-import java.util.List;
-
import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
-import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.EditTextPreference;
-import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
import android.widget.Button;
-import android.widget.Toast;
public class CustomLocationPreference extends EditTextPreference implements WeatherLocationTask.Callback {
private AlertDialog mDialog;
diff --git a/src/org/omnirom/omnijaws/SystemReceiver.java b/src/org/omnirom/omnijaws/SystemReceiver.java
index a89e8ce..3bb8099 100644
--- a/src/org/omnirom/omnijaws/SystemReceiver.java
+++ b/src/org/omnirom/omnijaws/SystemReceiver.java
@@ -20,7 +20,6 @@
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import android.net.ConnectivityManager;
import android.util.Log;
public class SystemReceiver extends BroadcastReceiver {
diff --git a/src/org/omnirom/omnijaws/WeatherInfo.java b/src/org/omnirom/omnijaws/WeatherInfo.java
index 310d696..9be263c 100755
--- a/src/org/omnirom/omnijaws/WeatherInfo.java
+++ b/src/org/omnirom/omnijaws/WeatherInfo.java
@@ -22,7 +22,6 @@
import android.content.Context;
import android.content.res.Resources;
-import android.graphics.Bitmap;
public class WeatherInfo {
private static final DecimalFormat sNoDigitsFormat = new DecimalFormat("0");
diff --git a/src/org/omnirom/omnijaws/WeatherLocationTask.java b/src/org/omnirom/omnijaws/WeatherLocationTask.java
index ee00a41..f1b1954 100644
--- a/src/org/omnirom/omnijaws/WeatherLocationTask.java
+++ b/src/org/omnirom/omnijaws/WeatherLocationTask.java
@@ -20,18 +20,11 @@
import java.util.List;
import android.app.AlertDialog;
-import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.AsyncTask;
-import android.os.Bundle;
-import android.preference.EditTextPreference;
import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
import android.widget.Toast;
public class WeatherLocationTask extends AsyncTask<Void, Void, List<WeatherInfo.WeatherLocation>> {
diff --git a/src/org/omnirom/omnijaws/WeatherService.java b/src/org/omnirom/omnijaws/WeatherService.java
index 5e45143..414ae39 100644
--- a/src/org/omnirom/omnijaws/WeatherService.java
+++ b/src/org/omnirom/omnijaws/WeatherService.java
@@ -25,7 +25,6 @@
import android.app.Service;
import android.content.Context;
import android.content.Intent;
-import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.location.Criteria;
import android.location.Location;
@@ -36,7 +35,6 @@
import android.os.HandlerThread;
import android.os.IBinder;
import android.os.PowerManager;
-import android.preference.PreferenceManager;
import android.text.TextUtils;
import android.util.Log;
@@ -288,10 +286,6 @@
}
private boolean checkPermissions() {
- if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION)
- != PackageManager.PERMISSION_GRANTED) {
- return false;
- }
- return true;
+ return checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
}
}
diff --git a/src/org/omnirom/omnijaws/YahooWeatherProvider.java b/src/org/omnirom/omnijaws/YahooWeatherProvider.java
index aeba19e..01fe6c7 100644
--- a/src/org/omnirom/omnijaws/YahooWeatherProvider.java
+++ b/src/org/omnirom/omnijaws/YahooWeatherProvider.java
@@ -174,39 +174,46 @@
@Override
public void startElement(String uri, String localName, String qName, Attributes attributes)
throws SAXException {
- if (qName.equals("yweather:location")) {
- city = attributes.getValue("city");
- } else if (qName.equals("yweather:units")) {
- temperatureUnit = attributes.getValue("temperature");
- speedUnit = attributes.getValue("speed");
- } else if (qName.equals("yweather:wind")) {
- windDirection = (int) stringToFloat(attributes.getValue("direction"), -1);
- windSpeed = stringToFloat(attributes.getValue("speed"), -1);
- } else if (qName.equals("yweather:atmosphere")) {
- humidity = stringToFloat(attributes.getValue("humidity"), -1);
- } else if (qName.equals("yweather:condition")) {
- condition = attributes.getValue("text");
- conditionCode = (int) stringToFloat(attributes.getValue("code"), -1);
- temperature = stringToFloat(attributes.getValue("temp"), Float.NaN);
- } else if (qName.equals("yweather:forecast")) {
- String date = attributes.getValue("date");
- String dayShort = attributes.getValue("day");
- // is this forecaset days before today?
- if (dayShort .equals(todayShort) && !addForecastDay) {
- addForecastDay = true;
- }
- if (addForecastDay) {
- DayForecast day = new DayForecast(
+ switch (qName) {
+ case "yweather:location":
+ city = attributes.getValue("city");
+ break;
+ case "yweather:units":
+ temperatureUnit = attributes.getValue("temperature");
+ speedUnit = attributes.getValue("speed");
+ break;
+ case "yweather:wind":
+ windDirection = (int) stringToFloat(attributes.getValue("direction"), -1);
+ windSpeed = stringToFloat(attributes.getValue("speed"), -1);
+ break;
+ case "yweather:atmosphere":
+ humidity = stringToFloat(attributes.getValue("humidity"), -1);
+ break;
+ case "yweather:condition":
+ condition = attributes.getValue("text");
+ conditionCode = (int) stringToFloat(attributes.getValue("code"), -1);
+ temperature = stringToFloat(attributes.getValue("temp"), Float.NaN);
+ break;
+ case "yweather:forecast":
+ String date = attributes.getValue("date");
+ String dayShort = attributes.getValue("day");
+ // is this forecaset days before today?
+ if (dayShort.equals(todayShort) && !addForecastDay) {
+ addForecastDay = true;
+ }
+ if (addForecastDay) {
+ DayForecast day = new DayForecast(
/* low */ stringToFloat(attributes.getValue("low"), Float.NaN),
/* high */ stringToFloat(attributes.getValue("high"), Float.NaN),
/* condition */ attributes.getValue("text"),
/* conditionCode */ (int) stringToFloat(attributes.getValue("code"), -1),
- attributes.getValue("date"),
- metric);
- if (!Float.isNaN(day.low) && !Float.isNaN(day.high) && day.conditionCode >= 0) {
- forecasts.add(day);
+ attributes.getValue("date"),
+ metric);
+ if (!Float.isNaN(day.low) && !Float.isNaN(day.high) && day.conditionCode >= 0) {
+ forecasts.add(day);
+ }
}
- }
+ break;
}
}
public boolean isComplete() {
diff --git a/src/org/omnirom/omnijaws/client/OmniJawsClient.java b/src/org/omnirom/omnijaws/client/OmniJawsClient.java
index 2760f82..ec68bf4 100644
--- a/src/org/omnirom/omnijaws/client/OmniJawsClient.java
+++ b/src/org/omnirom/omnijaws/client/OmniJawsClient.java
@@ -31,9 +31,6 @@
import android.database.Cursor;
import android.graphics.drawable.Drawable;
import android.net.Uri;
-import android.os.Handler;
-import android.os.UserHandle;
-import android.provider.Settings;
import android.util.Log;
import org.omnirom.omnijaws.Config;
@@ -285,8 +282,7 @@
int count = c.getCount();
if (count == 1) {
c.moveToPosition(0);
- boolean enabled = c.getInt(0) == 1;
- return enabled;
+ return c.getInt(0) == 1;
}
}
return true;