From b1a6b90820406e1c5729d148efcf0bb4754da4d9 Mon Sep 17 00:00:00 2001
From: Julian Catoni <julian.catoni@tu-dresden.de>
Date: Thu, 8 Aug 2019 16:08:40 +0200
Subject: [PATCH] Some fixes and code cleanup
---
.../org/openhab/habdroid/ui/PreferencesActivity.java | 1 -
.../openhab/habdroid/util/RetrofitClientInstance.java | 9 ++-------
mobile/src/main/res/values/strings.xml | 2 +-
.../main/res/xml/openlicht_connection_preferences.xml | 11 -----------
4 files changed, 3 insertions(+), 20 deletions(-)
delete mode 100644 mobile/src/main/res/xml/openlicht_connection_preferences.xml
diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/PreferencesActivity.java b/mobile/src/main/java/org/openhab/habdroid/ui/PreferencesActivity.java
index 4fac42a0..f1f8e4de 100644
--- a/mobile/src/main/java/org/openhab/habdroid/ui/PreferencesActivity.java
+++ b/mobile/src/main/java/org/openhab/habdroid/ui/PreferencesActivity.java
@@ -229,7 +229,6 @@ public class PreferencesActivity extends AppCompatActivity {
final Preference localConnPref = findPreference(Constants.SUBSCREEN_LOCAL_CONNECTION);
final Preference remoteConnPref = findPreference(Constants.SUBSCREEN_REMOTE_CONNECTION);
- final Preference openlichtConnPref = findPreference(Constants.PREFERENCE_OPENLICHT_URL);
final Preference themePref = findPreference(Constants.PREFERENCE_THEME);
final Preference clearCachePref = findPreference(Constants.PREFERENCE_CLEAR_CACHE);
final Preference clearDefaultSitemapPref =
diff --git a/mobile/src/main/java/org/openhab/habdroid/util/RetrofitClientInstance.java b/mobile/src/main/java/org/openhab/habdroid/util/RetrofitClientInstance.java
index 581fe0cc..1c73dc79 100644
--- a/mobile/src/main/java/org/openhab/habdroid/util/RetrofitClientInstance.java
+++ b/mobile/src/main/java/org/openhab/habdroid/util/RetrofitClientInstance.java
@@ -2,14 +2,10 @@ package org.openhab.habdroid.util;
import android.app.Activity;
import android.content.SharedPreferences;
-import android.preference.PreferenceActivity;
import android.preference.PreferenceManager;
import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory;
-
-import static android.content.Context.MODE_PRIVATE;
-
/*
* OpenLicht
* Use Retrofit to call the API
@@ -20,14 +16,13 @@ public class RetrofitClientInstance {
private static Retrofit retrofit;
-// private static final String BASE_URL = "http://10.0.2.2:5000";
public static Retrofit getRetrofitInstance(Activity activity) {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
- String openlichtUrl = preferences.getString("default_openlicht_url", null);
+ String url = preferences.getString(Constants.PREFERENCE_OPENLICHT_URL, "");
if (retrofit == null) {
retrofit = new Retrofit.Builder()
- .baseUrl(openlichtUrl)
+ .baseUrl(url)
.addConverterFactory(GsonConverterFactory.create())
.build();
}
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 154be608..3be9fd1f 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -58,7 +58,7 @@
<string name="settings_current_default_sitemap">Current default Sitemap: %1$s</string>
<string name="settings_openhab_alt_connection">Remote</string>
<string name="settings_openhab_connection">Local</string>
- <string name="settings_openlicht_connection">Openlicht</string>
+ <string name="settings_openlicht_connection">OpenLicht REST URL</string>
<string name="settings_notification_vibration">Notification vibration</string>
<string name="settings_notification_vibration_off">Off</string>
<string name="settings_notification_vibration_short">Short</string>
diff --git a/mobile/src/main/res/xml/openlicht_connection_preferences.xml b/mobile/src/main/res/xml/openlicht_connection_preferences.xml
deleted file mode 100644
index 485e371f..00000000
--- a/mobile/src/main/res/xml/openlicht_connection_preferences.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/settings_openhab_alt_connection">
- <org.openhab.habdroid.ui.widget.UrlInputPreference
- android:defaultValue="@string/empty_string"
- android:inputType="textNoSuggestions"
- android:key="default_openhab_alturl"
- android:summary="@string/settings_openhab_alturl_summary"
- android:title="@string/settings_openhab_alturl"
- android:icon="@drawable/ic_earth_grey_24dp" />
-</PreferenceScreen>
\ No newline at end of file
--
GitLab