Skip to content
Snippets Groups Projects
Commit b1a6b908 authored by Julian Catoni's avatar Julian Catoni
Browse files

Some fixes and code cleanup

parent ac3efa24
No related branches found
No related tags found
No related merge requests found
...@@ -229,7 +229,6 @@ public class PreferencesActivity extends AppCompatActivity { ...@@ -229,7 +229,6 @@ public class PreferencesActivity extends AppCompatActivity {
final Preference localConnPref = findPreference(Constants.SUBSCREEN_LOCAL_CONNECTION); final Preference localConnPref = findPreference(Constants.SUBSCREEN_LOCAL_CONNECTION);
final Preference remoteConnPref = findPreference(Constants.SUBSCREEN_REMOTE_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 themePref = findPreference(Constants.PREFERENCE_THEME);
final Preference clearCachePref = findPreference(Constants.PREFERENCE_CLEAR_CACHE); final Preference clearCachePref = findPreference(Constants.PREFERENCE_CLEAR_CACHE);
final Preference clearDefaultSitemapPref = final Preference clearDefaultSitemapPref =
......
...@@ -2,14 +2,10 @@ package org.openhab.habdroid.util; ...@@ -2,14 +2,10 @@ package org.openhab.habdroid.util;
import android.app.Activity; import android.app.Activity;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.preference.PreferenceActivity;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import retrofit2.Retrofit; import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.gson.GsonConverterFactory;
import static android.content.Context.MODE_PRIVATE;
/* /*
* OpenLicht * OpenLicht
* Use Retrofit to call the API * Use Retrofit to call the API
...@@ -20,14 +16,13 @@ public class RetrofitClientInstance { ...@@ -20,14 +16,13 @@ public class RetrofitClientInstance {
private static Retrofit retrofit; private static Retrofit retrofit;
// private static final String BASE_URL = "http://10.0.2.2:5000";
public static Retrofit getRetrofitInstance(Activity activity) { public static Retrofit getRetrofitInstance(Activity activity) {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(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) { if (retrofit == null) {
retrofit = new Retrofit.Builder() retrofit = new Retrofit.Builder()
.baseUrl(openlichtUrl) .baseUrl(url)
.addConverterFactory(GsonConverterFactory.create()) .addConverterFactory(GsonConverterFactory.create())
.build(); .build();
} }
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<string name="settings_current_default_sitemap">Current default Sitemap: %1$s</string> <string name="settings_current_default_sitemap">Current default Sitemap: %1$s</string>
<string name="settings_openhab_alt_connection">Remote</string> <string name="settings_openhab_alt_connection">Remote</string>
<string name="settings_openhab_connection">Local</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">Notification vibration</string>
<string name="settings_notification_vibration_off">Off</string> <string name="settings_notification_vibration_off">Off</string>
<string name="settings_notification_vibration_short">Short</string> <string name="settings_notification_vibration_short">Short</string>
......
<?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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment