From 57cd59b0d1c2d2507eb3370fbdcfc1110627b152 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Fri, 28 Feb 2020 17:49:43 +0100 Subject: [PATCH] Use Java 8 --- app/build.gradle | 4 +++ app/src/main/java/ch/fixme/status/Main.java | 30 ++++++++---------- .../main/java/ch/fixme/status/Parse12.java | 17 +++++----- .../main/java/ch/fixme/status/Parse13.java | 8 ++--- .../java/ch/fixme/status/ParseGeneric.java | 2 +- app/src/main/java/ch/fixme/status/Widget.java | 8 ++--- .../java/ch/fixme/status/Widget_config.java | 31 +++++++++---------- 7 files changed, 45 insertions(+), 55 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8946a5c..394325e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,6 +18,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } + compileOptions { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } } dependencies { diff --git a/app/src/main/java/ch/fixme/status/Main.java b/app/src/main/java/ch/fixme/status/Main.java index 798425a..36b3045 100644 --- a/app/src/main/java/ch/fixme/status/Main.java +++ b/app/src/main/java/ch/fixme/status/Main.java @@ -268,21 +268,17 @@ private AlertDialog createHsDialog() { .findViewById(R.id.listview); listView.setAdapter(adapter); listView.setFastScrollEnabled(true); - listView.setOnItemClickListener(new OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, - int position, long id) { - Log.d(TAG, "hs dialog, on click"); - String url = mHsUrls.get(position); - Editor edit = mPrefs.edit(); - edit.putString(Prefs.KEY_API_URL, url); - getApiTask = new GetApiTask(); - getApiTask.execute(url); - edit.commit(); - setIntent(null); - dismissDialog(DIALOG_LIST); - Log.i(TAG, "Item clicked=" + url + " (" + position + ")"); - } + listView.setOnItemClickListener((parent, view1, position, id) -> { + Log.d(TAG, "hs dialog, on click"); + String url = mHsUrls.get(position); + Editor edit = mPrefs.edit(); + edit.putString(Prefs.KEY_API_URL, url); + getApiTask = new GetApiTask(); + getApiTask.execute(url); + edit.commit(); + setIntent(null); + dismissDialog(DIALOG_LIST); + Log.i(TAG, "Item clicked=" + url + " (" + position + ")"); }); builder.setView(view); builder.setTitle(R.string.choose_hs); @@ -826,8 +822,8 @@ public View getView(int position, View convertView, ViewGroup parent) { if (convertView == null) { convertView = mInflater.inflate(R.layout.hs_entry, null); holder = new ViewHolder(); - holder.name = (TextView) convertView.findViewById(R.id.text1); - holder.desc = (TextView) convertView.findViewById(R.id.text2); + holder.name = convertView.findViewById(R.id.text1); + holder.desc = convertView.findViewById(R.id.text2); convertView.setTag(holder); } else { holder = (ViewHolder) convertView.getTag(); diff --git a/app/src/main/java/ch/fixme/status/Parse12.java b/app/src/main/java/ch/fixme/status/Parse12.java index adb7e89..1a6f3b7 100644 --- a/app/src/main/java/ch/fixme/status/Parse12.java +++ b/app/src/main/java/ch/fixme/status/Parse12.java @@ -87,18 +87,17 @@ protected HashMap parse() throws JSONException { if (!mApi.isNull(API_SENSORS)) { JSONArray sensors = mApi.getJSONArray(API_SENSORS); JSONObject elem; - HashMap>> result = new HashMap>>( - sensors.length()); + HashMap>> result = new HashMap<>(sensors.length()); for (int i = 0; i < sensors.length(); i++) { elem = (JSONObject) sensors.get(i); try { for (int j = 0; j < elem.length(); j++) { - ArrayList> elem_value = new ArrayList>(); + ArrayList> elem_value = new ArrayList<>(); String name = (String) elem.names().get(j); JSONObject obj = elem.getJSONObject(name); for (int k = 0; k < obj.length(); k++) { String name2 = (String) obj.names().get(k); - HashMap elem_value_map = new HashMap(); + HashMap elem_value_map = new HashMap<>(); elem_value_map.put(API_SENSOR_NAME, name2); elem_value_map.put(API_SENSOR_VALUE, obj.getString(name2)); elem_value.add(elem_value_map); @@ -108,8 +107,8 @@ protected HashMap parse() throws JSONException { } catch (Exception e) { Log.e(Main.TAG, e.getLocalizedMessage()); e.printStackTrace(); - ArrayList> elem_value = new ArrayList>(); - HashMap elem_value_map = new HashMap(); + ArrayList> elem_value = new ArrayList<>(); + HashMap elem_value_map = new HashMap<>(); elem_value_map.put(API_SENSOR_VALUE, elem.toString()); elem_value.add(elem_value_map); result.put((String) elem.names().get(0), elem_value); @@ -123,8 +122,7 @@ protected HashMap parse() throws JSONException { if (!mApi.isNull(API_STREAM)) { JSONObject stream = mApi.optJSONObject(API_STREAM); if (stream != null) { - HashMap streamMap = new HashMap( - stream.length()); + HashMap streamMap = new HashMap<>(stream.length()); JSONArray names = stream.names(); for (int i = 0; i < stream.length(); i++) { final String type = names.getString(i); @@ -138,8 +136,7 @@ protected HashMap parse() throws JSONException { if (!mApi.isNull(API_CAM)) { JSONArray cam = mApi.optJSONArray(API_CAM); if (cam != null) { - HashMap camMap = new HashMap( - cam.length()); + HashMap camMap = new HashMap<>(cam.length()); for (int i = 0; i < cam.length(); i++) { camMap.put("http", cam.getString(i)); } diff --git a/app/src/main/java/ch/fixme/status/Parse13.java b/app/src/main/java/ch/fixme/status/Parse13.java index 524a2da..a1480e6 100644 --- a/app/src/main/java/ch/fixme/status/Parse13.java +++ b/app/src/main/java/ch/fixme/status/Parse13.java @@ -128,9 +128,9 @@ protected HashMap parse() throws JSONException { continue; } elem = sensors.getJSONArray(sensor_name); - elem_value = new ArrayList>(elem.length()); + elem_value = new ArrayList<>(elem.length()); for (int j = 0; j < elem.length(); j++) { - HashMap elem_value_map = new HashMap(); + HashMap elem_value_map = new HashMap<>(); try { JSONObject obj = (JSONObject) elem.get(j); if (!obj.isNull(API_SENSOR_VALUE) @@ -185,7 +185,7 @@ protected HashMap parse() throws JSONException { if (!mApi.isNull(API_STREAM)) { JSONObject stream = mApi.optJSONObject(API_STREAM); if (stream != null) { - HashMap streamMap = new HashMap( + HashMap streamMap = new HashMap<>( stream.length()); JSONArray names = stream.names(); for (int i = 0; i < stream.length(); i++) { @@ -201,7 +201,7 @@ protected HashMap parse() throws JSONException { if (!mApi.isNull(API_CAM)) { JSONArray cam = mApi.optJSONArray(API_CAM); if (cam != null) { - ArrayList camList = new ArrayList(cam.length()); + ArrayList camList = new ArrayList<>(cam.length()); for (int i = 0; i < cam.length(); i++) { camList.add(cam.getString(i)); } diff --git a/app/src/main/java/ch/fixme/status/ParseGeneric.java b/app/src/main/java/ch/fixme/status/ParseGeneric.java index 9b20e58..bc21ebf 100644 --- a/app/src/main/java/ch/fixme/status/ParseGeneric.java +++ b/app/src/main/java/ch/fixme/status/ParseGeneric.java @@ -10,7 +10,7 @@ import java.util.HashMap; public class ParseGeneric { - protected HashMap mResult = new HashMap(); + protected HashMap mResult = new HashMap<>(); protected JSONObject mApi; protected static final String API_NAME = "space"; diff --git a/app/src/main/java/ch/fixme/status/Widget.java b/app/src/main/java/ch/fixme/status/Widget.java index c24f8fe..a78e849 100644 --- a/app/src/main/java/ch/fixme/status/Widget.java +++ b/app/src/main/java/ch/fixme/status/Widget.java @@ -308,12 +308,8 @@ protected void onHandleIntent(Intent intent) { + widgetId, ParseGeneric.API_DEFAULT); Log.i(TAG, "Update widgetid " + widgetId + " with url " + url); - new Handler(Looper.getMainLooper()).post(new Runnable() { - @Override - public void run() { - new GetApiTask(ctxt, widgetId).execute(url); - } - }); + new Handler(Looper.getMainLooper()) + .post(() -> new GetApiTask(ctxt, widgetId).execute(url)); } stopSelf(); } diff --git a/app/src/main/java/ch/fixme/status/Widget_config.java b/app/src/main/java/ch/fixme/status/Widget_config.java index 5826680..f556e4a 100644 --- a/app/src/main/java/ch/fixme/status/Widget_config.java +++ b/app/src/main/java/ch/fixme/status/Widget_config.java @@ -56,22 +56,19 @@ public void onCreate(Bundle savedInstanceState) { Bundle extras = intent.getExtras(); mAppWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); - findViewById(R.id.choose_ok).setOnClickListener( - new View.OnClickListener() { - public void onClick(View v) { - Editor edit = mPrefs.edit(); - edit.putBoolean( - Prefs.KEY_WIDGET_TRANSPARENCY, - ((CheckBox) findViewById(R.id.choose_transparency)) - .isChecked()); - edit.putBoolean(Prefs.KEY_WIDGET_TEXT, - ((CheckBox) findViewById(R.id.choose_text)) - .isChecked()); - edit.commit(); - setWidgetAlarm(); - finish(); - } - }); + findViewById(R.id.choose_ok).setOnClickListener(v -> { + Editor edit = mPrefs.edit(); + edit.putBoolean( + Prefs.KEY_WIDGET_TRANSPARENCY, + ((CheckBox) findViewById(R.id.choose_transparency)) + .isChecked()); + edit.putBoolean(Prefs.KEY_WIDGET_TEXT, + ((CheckBox) findViewById(R.id.choose_text)) + .isChecked()); + edit.commit(); + setWidgetAlarm(); + finish(); + }); ((CheckBox) findViewById(R.id.choose_transparency)).setChecked(mPrefs .getBoolean(Prefs.KEY_WIDGET_TRANSPARENCY, Prefs.DEFAULT_WIDGET_TRANSPARENCY)); @@ -149,7 +146,7 @@ protected void onPostExecute(String result) { JSONArray arr = obj.names(); int len = obj.length(); String[] names = new String[len]; - final ArrayList url = new ArrayList(len); + final ArrayList url = new ArrayList<>(len); for (int i = 0; i < len; i++) { names[i] = arr.getString(i); }