Page MenuHomeGitPull.it
Files F2435226

D123.1729282739.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D123.1729282739.diff
View Options

diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
--- a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
@@ -632,7 +632,7 @@
if (showingMainFragmentFromOther){
FragmentManager fraMan = getSupportFragmentManager();
Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
- Log.d(DEBUG_TAG, "Requested main fragment, not visible. Search by TAG: "+fragment);
+ Log.d(DEBUG_TAG, "Requested main fragment, not visible. Search by TAG returned: "+fragment);
if(fragment!=null){
//the fragment is there but not shown
probableFragment = (MainScreenFragment) fragment;
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java
--- a/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java
@@ -373,7 +373,7 @@
Log.d(DEBUG_TAG, "Saving instance state");
Fragment fragment = getChildFragmentManager().findFragmentById(R.id.resultFrame);
if (fragment!=null)
- getChildFragmentManager().putFragment(outState, SAVED_FRAGMENT, fragment);
+ getChildFragmentManager().putFragment(outState, SAVED_FRAGMENT, fragment);
if (fragmentHelper!=null) fragmentHelper.setBlockAllActivities(true);
instanceStateSaved = true;
@@ -483,12 +483,13 @@
ArrivalsFragment frag = (ArrivalsFragment) fragment;
frag.setReloadOnResume(false);
}
+ //deactivate
suppressArrivalsReload = false;
}
if(pendingStopID!=null){
- Log.d(DEBUG_TAG, "Re-requesting arrivals for pending stop "+pendingStopID);
+ Log.d(DEBUG_TAG, "Pending request for arrivals at stop ID: "+pendingStopID);
requestArrivalsForStopID(pendingStopID);
pendingStopID = null;
}
@@ -767,6 +768,8 @@
}
}
else {
+ Log.d(DEBUG_TAG, "This is probably the first arrivals search, preparing GUI");
+ prepareGUIForBusLines();
new AsyncArrivalsSearcher(fragmentHelper,fetchers, getContext()).execute(ID);
Log.d(DEBUG_TAG, "Started search for arrivals of stop " + ID);
}

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 18, 22:18 (11 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
635342
Default Alt Text
D123.1729282739.diff (2 KB)

Event Timeline

Public contents are in Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) or GNU Free Documentation License (at your option) unless otherwise noted. · Contact / Register