From 8e51b33658d14e953b211fbfbc6255d72ba48fbc Mon Sep 17 00:00:00 2001 From: pk910 Date: Fri, 4 Mar 2016 11:39:57 +0100 Subject: [PATCH] =?utf8?q?WifiSettings=20=C3=BCberarbeitet,=20kleine=20fix?= =?utf8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../campusapp/fragments/Dashboard.java | 2 + .../campusapp/fragments/DashboardMensa.java | 8 +- .../fragments/DashboardNewsDhbw.java | 33 ++++- .../fragments/DashboardNewsStuv.java | 33 ++++- .../campusapp/fragments/MensaCard.java | 4 +- .../fragments/MensaTagesplanListAdapter.java | 4 + .../de/dhbwloe/campusapp/fragments/News.java | 16 ++- .../dhbwloe/campusapp/fragments/Settings.java | 59 +++++++- .../campusapp/fragments/WifiSettings.java | 134 +++++++----------- .../campusapp/mensaplan/MensaTagesplan.java | 16 +++ .../campusapp/mensaplan/MensaplanManager.java | 2 +- .../campusapp/network/XmlRequestHelper.java | 2 +- .../campusapp/wifi/SecureLoginManager.java | 2 + .../campusapp/wifi/SecureLoginTask.java | 2 - .../wifi/WifiConfigurationManager.java | 113 ++++++++++++++- .../campusapp/wifi/WifiNetworkSettings.java | 10 +- .../fragment_mensa_tagesplan_listitem.xml | 12 ++ app/src/main/res/layout/fragment_settings.xml | 122 +++++++++++++++- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 37 +++-- 20 files changed, 469 insertions(+), 144 deletions(-) diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/Dashboard.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/Dashboard.java index 574a4a7..f7413c8 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/Dashboard.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/Dashboard.java @@ -48,6 +48,8 @@ public class Dashboard extends CampusAppFragment { try { view = inflater.inflate(R.layout.fragment_dashboard, container, false); } catch (InflateException e) { + if(view == null) + return null; } AppContext.setTitle(AppContext.getResString(R.string.dashboard_title)); diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java index ccc2589..fa75c5c 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java @@ -72,6 +72,10 @@ public class DashboardMensa extends CampusAppFragment { int i = 0; LayoutInflater li = LayoutInflater.from(AppContext.getMainActivity()); do { + String menuTitle = cmenue.getMenuName(); + if(menuTitle == null || menuTitle.matches("^Buffet")) + continue; + RelativeLayout menu = (RelativeLayout) li.inflate(R.layout.fragment_dashboard_mensa_menu, null, false); menueContainer.addView(menu); @@ -79,8 +83,8 @@ public class DashboardMensa extends CampusAppFragment { TextView menuPrice = (TextView) menu.findViewById(R.id.menuPrice); menuName.setText(cmenue.getName()); - double price = cmenue.getStudentPrice(); - menuPrice.setText(Double.toString(price)); + String priceStr = cmenue.getFormatedRolePrice(); + menuPrice.setText(priceStr); } while(i < dayplans.length && (cmenue = dayplans[++i]) != null && cmenue.getPlanDate() == dayplan.getPlanDate()); } diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsDhbw.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsDhbw.java index 3f1c3c2..48342fa 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsDhbw.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsDhbw.java @@ -7,13 +7,17 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; + import de.dhbwloe.campusapp.CampusAppFragment; import de.dhbwloe.campusapp.R; /** * A simple {@link Fragment} subclass. */ -public class DashboardNewsDhbw extends CampusAppFragment { +public class DashboardNewsDhbw extends News { public DashboardNewsDhbw() { @@ -24,8 +28,31 @@ public class DashboardNewsDhbw extends CampusAppFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_dashboard_news_dhbw, container, false); + oFragmentView = inflater.inflate(R.layout.fragment_dashboard_news_stuv, container, false); + + return oFragmentView; + } + + @Override + public void onResume() { + super.onResume(); + + refreshStuvNews(); + } + + private void refreshStuvNews() { + loadNewsSource("DHBW", true); + + Collections.sort(newsListItems, new Comparator() { + @Override + public int compare(NewsListItem item2, NewsListItem item1) { + long now = (new Date()).getTime() / 1000; + return (int) (item2.getTimeDifference(now) - item1.getTimeDifference(now)); + } + }); + + + // show newsListItems } } diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsStuv.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsStuv.java index 73d83ec..ba692a6 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsStuv.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsStuv.java @@ -7,13 +7,17 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; + import de.dhbwloe.campusapp.CampusAppFragment; import de.dhbwloe.campusapp.R; /** * A simple {@link Fragment} subclass. */ -public class DashboardNewsStuv extends CampusAppFragment { +public class DashboardNewsStuv extends News { public DashboardNewsStuv() { @@ -24,8 +28,31 @@ public class DashboardNewsStuv extends CampusAppFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_dashboard_news_stuv, container, false); + oFragmentView = inflater.inflate(R.layout.fragment_dashboard_news_stuv, container, false); + + return oFragmentView; + } + + @Override + public void onResume() { + super.onResume(); + + refreshStuvNews(); + } + + private void refreshStuvNews() { + loadNewsSource("STUV", false); + loadEventsSource("STUV", false); + + Collections.sort(newsListItems, new Comparator() { + @Override + public int compare(NewsListItem item2, NewsListItem item1) { + long now = (new Date()).getTime() / 1000; + return (int) (item2.getTimeDifference(now) - item1.getTimeDifference(now)); + } + }); + + // show newsListItems } } diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaCard.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaCard.java index 93b9132..3933be9 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaCard.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaCard.java @@ -43,8 +43,8 @@ public class MensaCard extends CampusAppFragment { public void showNfcCardData(Bundle bundle) { TextView cardDataView = (TextView)view.findViewById(R.id.balanceTxt); double balance = bundle.getDouble("balance"); - DecimalFormat df = new DecimalFormat("#,###.00"); - cardDataView.setText(df.format(balance)+" €"); + DecimalFormat df = new DecimalFormat(AppContext.getResString(R.string.mensaformat_price)); + cardDataView.setText(df.format(balance)); } } diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaTagesplanListAdapter.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaTagesplanListAdapter.java index f0bf2a1..c8509e8 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaTagesplanListAdapter.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/MensaTagesplanListAdapter.java @@ -50,6 +50,8 @@ public class MensaTagesplanListAdapter extends ArrayAdapter newsListItems = new ArrayList(); + protected ArrayList newsListItems = new ArrayList(); @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -86,10 +86,11 @@ public class News extends CampusAppFragment { @Override public void onResume() { super.onResume(); - refreshNewsItems(); + if(view != null) + refreshNewsItems(); } - private void refreshNewsItems() { + protected void refreshNewsItems() { newsListItems.clear(); CheckBox showDhbwNewsChkbok = (CheckBox) view.findViewById(R.id.showDhbwNews); @@ -109,14 +110,15 @@ public class News extends CampusAppFragment { Collections.sort(newsListItems, new Comparator() { @Override public int compare(NewsListItem item2, NewsListItem item1) { - long now = (new Date()).getTime()/1000; + long now = (new Date()).getTime() / 1000; return (int) (item2.getTimeDifference(now) - item1.getTimeDifference(now)); } }); - listAdapter.notifyDataSetChanged(); + if(listAdapter != null) + listAdapter.notifyDataSetChanged(); } - private void loadNewsSource(String sourceName, boolean isDhbw) { + protected void loadNewsSource(String sourceName, boolean isDhbw) { long now = (new Date()).getTime() / 1000; NewsItem[] news = AppContext.getDatabaseManager().getNewsItems(sourceName, now, now - (86400 * 30 * 6)); // load 6 month @@ -126,7 +128,7 @@ public class News extends CampusAppFragment { } } - private void loadEventsSource(String sourceName, boolean isDhbw) { + protected void loadEventsSource(String sourceName, boolean isDhbw) { long now = (new Date()).getTime() / 1000; CourseEvent[] events = AppContext.getDatabaseManager().getCourseCalendarTimetable(sourceName, now, 30 * 6); // load 6 month diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/Settings.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/Settings.java index 85a4442..d320591 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/Settings.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/Settings.java @@ -6,6 +6,8 @@ import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.Spinner; import de.dhbwloe.campusapp.CampusAppFragment; import de.dhbwloe.campusapp.R; @@ -14,7 +16,8 @@ import de.dhbwloe.campusapp.R; * A simple {@link Fragment} subclass. */ public class Settings extends CampusAppFragment { - + private EditText courseNameInput; + private Spinner mensaRoleInput; public Settings() { // Required empty public constructor @@ -24,8 +27,58 @@ public class Settings extends CampusAppFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_settings, container, false); + oFragmentView = inflater.inflate(R.layout.fragment_settings, container, false); + + courseNameInput = (EditText) oFragmentView.findViewById(R.id.courseNameInput); + mensaRoleInput = (Spinner) oFragmentView.findViewById(R.id.mensaRoleInput); + + return oFragmentView; + } + + + @Override + public void onStart() { + super.onStart(); + + String courseName = AppContext.getDatabaseManager().getRuntimeCache("CourseName"); + if(courseName == null || courseName.isEmpty()) + courseName = ""; + courseNameInput.setText(courseName); + + String mensaRoleName = AppContext.getDatabaseManager().getRuntimeCache("MensaRole"); + if (mensaRoleName == null || mensaRoleName.isEmpty()) + mensaRoleName = "0"; + int mensaRole = Integer.parseInt(mensaRoleName); + mensaRoleInput.setSelection(mensaRole); } + @Override + public void onStop() { + super.onStop(); + boolean overrideNavigation = false; + + String courseName = AppContext.getDatabaseManager().getRuntimeCache("CourseName"); + if (courseName == null || courseName.isEmpty()) + courseName = ""; + + String newCourseName = courseNameInput.getText().toString(); + if(!courseName.equalsIgnoreCase(newCourseName)) { + AppContext.getDatabaseManager().setRuntimeCache("CourseName", newCourseName); + overrideNavigation = true; + } + + String mensaRoleName = AppContext.getDatabaseManager().getRuntimeCache("MensaRole"); + if (mensaRoleName == null || mensaRoleName.isEmpty()) + mensaRoleName = ""; + String newMensaRoleName = Integer.toString(mensaRoleInput.getSelectedItemPosition()); + if(!mensaRoleName.equalsIgnoreCase(newMensaRoleName)) { + AppContext.getDatabaseManager().setRuntimeCache("MensaRole", newMensaRoleName); + overrideNavigation = true; + } + + if(overrideNavigation) { + AppContext.getNavigationManager().navigatePage("Splashscreen", null, false); + + } + } } diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/WifiSettings.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/WifiSettings.java index 615d7ba..ae5d8e0 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/WifiSettings.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/WifiSettings.java @@ -78,47 +78,13 @@ public class WifiSettings extends CampusAppFragment { public void onReceive(Context arg0, Intent intent) { String action = intent.getAction(); if(action.equals(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION)){ - WifiInfo myWifiInfo = wifiManager.getConnectionInfo(); + WifiInfo wifiInfo = wifiManager.getConnectionInfo(); + SupplicantState wifiState = ((SupplicantState) intent.getParcelableExtra(WifiManager.EXTRA_NEW_STATE)); - WifiNetworkSettings settings = null; - for(int i = 0; i < wifiPresets.length; i++) { - if(wifiPresets[i].getSSID().equalsIgnoreCase(myWifiInfo.getSSID())) { - settings = wifiPresets[i]; - break; - } - } - - if(settings != null) { - SupplicantState supl_state = ((SupplicantState) intent.getParcelableExtra(WifiManager.EXTRA_NEW_STATE)); - switch (supl_state) { - case ASSOCIATING: - settings.isAssociating = true; - settings.isAssociated = false; - settings.isAuthenticated = false; - settings.isDisconnected = false; - break; - case ASSOCIATED: - settings.isAssociated = true; - break; - case COMPLETED: - settings.isAuthenticated = true; - break; - case DISCONNECTED: - settings.isAssociated = false; - settings.isAssociating = false; - settings.isDisconnected = true; - break; - default: - break; - } - updateWifiState(); - } + wifiConfigManager.updateWifiState(wifiInfo, wifiState); } - NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO); - if (networkInfo != null && networkInfo.getType() == ConnectivityManager.TYPE_WIFI) { - updateWifiState(); - } + updateWifiState(); } }; private BroadcastReceiver wifiScanReceiver = new BroadcastReceiver() { @@ -139,7 +105,17 @@ public class WifiSettings extends CampusAppFragment { wifiManager = (WifiManager)AppContext.getMainActivity().getSystemService(AppContext.getMainActivity().WIFI_SERVICE); connectivityManager = (ConnectivityManager) AppContext.getMainActivity().getSystemService(Activity.CONNECTIVITY_SERVICE); - wifiConfigManager = new WifiConfigurationManager(wifiManager); + wifiConfigManager = new WifiConfigurationManager(wifiManager, this); + } + + public String trimWifiSSID(String ssid) { + if(ssid == null) + return null; + if(ssid.matches("^\"(.*)\"$")) { + ssid = ssid.substring(1, ssid.length()-1); + } + + return ssid; } private void updateSelectedNetworkInformation() { @@ -238,10 +214,10 @@ public class WifiSettings extends CampusAppFragment { updateWifiConnectButton(); } - private void updateWifiState() { + public void updateWifiState() { NetworkInfo myNetworkInfo = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI); WifiInfo myWifiInfo = wifiManager.getConnectionInfo(); - String ssid = (myWifiInfo != null ? myWifiInfo.getSSID() : null); + String ssid = trimWifiSSID(myWifiInfo != null ? myWifiInfo.getSSID() : null); if(ssid == null) return; @@ -255,54 +231,17 @@ public class WifiSettings extends CampusAppFragment { if(settings == null) return; - if(settings.isTryConnecting) { - boolean success = false; - if(settings.isDisconnected) { - settings.failedAuthentication = true; - settings.isTryConnecting = false; - } else if(settings.isAssociated) { - settings.isTryConnecting = false; - success = true; - } - if(!settings.isTryConnecting) { - // success - // TODO: continue - } - } - - Resources resources = AppContext.getMainActivity().getResources(); String status; if(myNetworkInfo.isConnectedOrConnecting()) { int statusId = (myNetworkInfo.isConnected() ? R.string.wifisettings_status_connected : R.string.wifisettings_status_connecting); - - - ssid = ssid.replace("\"", ""); status = String.format(resources.getString(statusId), ssid); - - - - - //if(networkConnecting && wifiPresets[connectingNetworkIndex].getSSID().equalsIgnoreCase(ssid)) { - - /* - - wifiConfigManager.finalizeConnection(wifiPresets[connectingNetworkIndex], myNetworkInfo, myWifiInfo, new WifiConfigurationManager.WifiConfigurationComplete() { - @Override - public void onWifiConfigurationComplete(WifiNetworkSettings settings, String response) { - networkConnecting = false; - connectingNetworkIndex = 0; - updateWifiConnectButton(); - } - }); - */ - //} } else { status = resources.getString(R.string.wifisettings_status_disconnected); } - TextView statusTextView = (TextView)view.findViewById(R.id.wifiStatusText); statusTextView.setText(status); + updateWifiConnectButton(); } @@ -331,21 +270,47 @@ public class WifiSettings extends CampusAppFragment { int buttonTextId = 0; NetworkInfo networkInfo = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI); WifiInfo wifiInfo = wifiManager.getConnectionInfo(); + WifiConfigurationManager.WifiConnectionStatus status = wifiConfigManager.getWifiState(preset); + String ssid = trimWifiSSID(wifiInfo != null ? wifiInfo.getSSID() : null); + + Log.i("Wifi", ssid + "|" + preset.getSSID()); if(!wifiManager.isWifiEnabled()) { buttonTextId = R.string.wifisettings_connect_button_disabled; - } else if(networkInfo.isConnectedOrConnecting() && wifiInfo.getSSID() != null && wifiInfo.getSSID().equalsIgnoreCase(preset.getSSID())) { + } else if(networkInfo.isConnectedOrConnecting() && ssid != null && ssid.equalsIgnoreCase(preset.getSSID()) && status == WifiConfigurationManager.WifiConnectionStatus.WIFISTATE_NULL) { buttonTextId = R.string.wifisettings_connect_button_ready; - } else if(preset.isTryConnecting) { - buttonTextId = R.string.wifisettings_connect_button_connecting; } else if(!networkScanned) { buttonTextId = R.string.wifisettings_connect_button_scan; } else if(!preset.isInScanResult) { buttonTextId = R.string.wifisettings_connect_button_notfound; buttonEnabled = true; } else { - buttonEnabled = true; - buttonTextId = R.string.wifisettings_connect_button; + buttonTextId = 0; + if(status != WifiConfigurationManager.WifiConnectionStatus.WIFISTATE_NULL) { + switch (status) { + case WIFISTATE_CONNECTING: + buttonTextId = R.string.wifisettings_connect_button_connecting; + break; + case WIFISTATE_AUTHENTICATING: + buttonTextId = R.string.wifisettings_connect_button_authenticating; + break; + case WIFISTATE_CONNECTED: + buttonTextId = R.string.wifisettings_connect_button_ready; + break; + case WIFISTATE_FAILED: + buttonTextId = R.string.wifisettings_connect_button_failed; + buttonEnabled = true; + break; + } + } + if(wifiConfigManager.isLocked(preset) && buttonTextId == 0) { + buttonTextId = R.string.wifisettings_connect_button_connecting; + } + + if(buttonTextId == 0) { + buttonEnabled = true; + buttonTextId = R.string.wifisettings_connect_button; + } } Button connectBtn = (Button) view.findViewById(R.id.wifiConnectBtn); @@ -406,7 +371,6 @@ public class WifiSettings extends CampusAppFragment { if (username.length() > 0 && password.length() > 0) { if(settings != null) { - settings.isTryConnecting = true; settings.setAuthData(username, password); wifiConfigManager.connect(settings); diff --git a/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaTagesplan.java b/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaTagesplan.java index 6afb306..610e62e 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaTagesplan.java +++ b/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaTagesplan.java @@ -1,12 +1,16 @@ package de.dhbwloe.campusapp.mensaplan; import java.text.DateFormat; +import java.text.DecimalFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; import java.util.zip.CRC32; +import de.dhbwloe.campusapp.CampusAppContext; +import de.dhbwloe.campusapp.R; + /** * Created by pk910 on 22.01.2016. */ @@ -110,6 +114,18 @@ public class MensaTagesplan { return price; } + public String getFormatedRolePrice() { + String mensaRoleName = CampusAppContext.getInstance().getDatabaseManager().getRuntimeCache("MensaRole"); + if (mensaRoleName == null || mensaRoleName.isEmpty()) + mensaRoleName = "0"; + int mensaRole = Integer.parseInt(mensaRoleName); + double price = (aPriceArray[mensaRole] / 100.0); + + DecimalFormat df = new DecimalFormat(CampusAppContext.getInstance().getResString(R.string.mensaformat_price)); + String formatedPrice = df.format(price); + return formatedPrice; + } + public void setIsNew() { bIsNew = true; } diff --git a/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaplanManager.java b/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaplanManager.java index 20ef99a..355ab16 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaplanManager.java +++ b/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaplanManager.java @@ -59,7 +59,7 @@ public class MensaplanManager extends XmlRequestHelper { // 2,90€( pro 100g)? if(pricestr == null) return 0; - Pattern r = Pattern.compile("^([0-9,]+)€( pro [0-9]+[a-z]+)$"); + Pattern r = Pattern.compile("^([0-9,]+)€( pro [0-9]+[a-z]+)?$"); Matcher m = r.matcher(pricestr); if (m.find()) { NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN); diff --git a/app/src/main/java/de/dhbwloe/campusapp/network/XmlRequestHelper.java b/app/src/main/java/de/dhbwloe/campusapp/network/XmlRequestHelper.java index f9c59fb..f1507ef 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/network/XmlRequestHelper.java +++ b/app/src/main/java/de/dhbwloe/campusapp/network/XmlRequestHelper.java @@ -56,7 +56,7 @@ public abstract class XmlRequestHelper { String error = null; try { error = new String(errorResponse, "US-ASCII"); - } catch (UnsupportedEncodingException e1) { + } catch (Exception e1) { } Log.i("HTTPClient", " Error: " + statusCode + " - " + error); onXmlRequestFail(statusCode, error); diff --git a/app/src/main/java/de/dhbwloe/campusapp/wifi/SecureLoginManager.java b/app/src/main/java/de/dhbwloe/campusapp/wifi/SecureLoginManager.java index d98c626..073a76b 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/wifi/SecureLoginManager.java +++ b/app/src/main/java/de/dhbwloe/campusapp/wifi/SecureLoginManager.java @@ -109,6 +109,7 @@ public class SecureLoginManager extends AsyncTask list = wifiManager.getConfiguredNetworks(); + for(WifiConfiguration k : list) { + if(k.SSID.equalsIgnoreCase(wifiConfig.SSID)) { + int networkId = wifiManager.getConnectionInfo().getNetworkId(); + wifiManager.removeNetwork(networkId); + } + } + int networkId = wifiManager.addNetwork(wifiConfig); wifiManager.enableNetwork(networkId, true); + + wifiManager.saveConfiguration(); + } + + public boolean isLocked(WifiNetworkSettings settings) { + return isLocked && (tryConnectTo == settings); } } diff --git a/app/src/main/java/de/dhbwloe/campusapp/wifi/WifiNetworkSettings.java b/app/src/main/java/de/dhbwloe/campusapp/wifi/WifiNetworkSettings.java index 96a561f..4eb9947 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/wifi/WifiNetworkSettings.java +++ b/app/src/main/java/de/dhbwloe/campusapp/wifi/WifiNetworkSettings.java @@ -173,12 +173,6 @@ public class WifiNetworkSettings { public TabLayout.Tab tab; public boolean isInScanResult = false; - public boolean isTryConnecting = false; - public boolean isAssociating = false; - public boolean isAssociated = false; - public boolean isAuthenticated = false; - public boolean isDisconnected = false; - public boolean failedAuthentication = false; public WifiNetworkSettings(String name, String ssid, WifiNetworkAuthenticationTypes authType) { this.name = name; @@ -263,4 +257,8 @@ public class WifiNetworkSettings { return caName; } + public SecureLoginManager getSecureLoginManager() { + return performDHSecureLogin; + } + } diff --git a/app/src/main/res/layout/fragment_mensa_tagesplan_listitem.xml b/app/src/main/res/layout/fragment_mensa_tagesplan_listitem.xml index fe70e1c..a5b8469 100644 --- a/app/src/main/res/layout/fragment_mensa_tagesplan_listitem.xml +++ b/app/src/main/res/layout/fragment_mensa_tagesplan_listitem.xml @@ -14,6 +14,18 @@ android:layout_alignParentLeft="true" android:layout_alignParentStart="true" /> + + + tools:context="de.dhbwloe.campusapp.fragments.Settings" + android:padding="8dp" + android:orientation="vertical"> - - + android:layout_height="wrap_content" + android:layout_margin="8dp" + card_view:cardCornerRadius="5dp"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 27b9493..16272e8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,7 +2,7 @@ #E3001B #8D0011 - #7E878E + #8D0011 #8D0011 #E3001B diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a394bd..cb90f70 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,6 +32,7 @@ dd.MM. dd.MM.yyy HH:mm dd.MM.yyy + #,##0.00 € Search: %s Campus App @@ -102,8 +103,21 @@ STUV Events mehr... + Einstellungen + Vorlesungsplan + Deine Kursbezeichnung: + Beispiel: tif13a, win14a, wwi15b + Mensasplan + Deine Berufung: + + Student + Mitarbeiter + Schüler + Gast + + Bitte tippe deine Kursbezeichnung ein: - (Beispiel: tif13a, win14a, wwi15b) + () Ok Alternativ kannst du die App auch als Gast starten. Jedoch stehen im Gastmodus nicht alle Funktionen zur verfügung. Als Gast starten @@ -141,8 +155,8 @@ WLAN Adapter deaktiviert Verbunden! Verbinde... - Settings - + Authentifiziere... + Login fehlgeschlagen! WLAN Status: Verbunden mit %1$s @@ -150,23 +164,6 @@ Nicht Verbunden - - Kursbezeichnung (z.B. tif13a) - Arbeitsposition - - Student - Mitarbeiter - Schüler - Gast - - - 0 - 1 - 2 - 3 - - - Hello blank fragment -- 2.20.1