vitalif
/
ElectronReminder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix reminder display

master
Vitaliy Filippov 2016-02-24 02:27:37 +03:00
parent e895193ed7
commit 56fbd90022
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ru/vfilippov/electronreminder/MainActivity.java
View File

@ -128,7 +128,6 @@ public class MainActivity extends AppCompatActivity
private void loadRemindersFile() private void loadRemindersFile()
{ {
SimpleXmlNode n = SimpleXml.readXmlFile(getFilesDir(), "reminders.xml"); SimpleXmlNode n = SimpleXml.readXmlFile(getFilesDir(), "reminders.xml");
reminders = null;
if (n != null) if (n != null)
{ {
reminders.clear(); reminders.clear();
@ -143,7 +142,7 @@ public class MainActivity extends AppCompatActivity
private boolean loadTripsFile() private boolean loadTripsFile()
{ {
SimpleXmlNode xmltrips = SimpleXml.readXmlFile(getFilesDir(), "trips_"+curFrom+"_"+curTo+".xml"); SimpleXmlNode xmltrips = SimpleXml.readXmlFile(getFilesDir(), "trips_"+curFrom+"_"+curTo+".xml");
if (xmltrips != null) if (xmltrips != null && xmltrips.childrenByName.get("segment") != null)
{ {
trips.clear(); trips.clear();
for (SimpleXmlNode s: xmltrips.childrenByName.get("segment")) for (SimpleXmlNode s: xmltrips.childrenByName.get("segment"))
@ -323,6 +322,7 @@ public class MainActivity extends AppCompatActivity
} }
}); });
loadRemindersFile();
loadStations(); loadStations();
} }