moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 03:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix race condition between completeOnCreate() and onConfigurationChanged()

Browse Source
This commit is contained in:
Cameron Gutman 2017-11-23 11:25:51 -08:00
parent 16e285d926
commit f37ab40c2f
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/limelight/PcView.java
View File

@ -61,7 +61,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
private PcGridAdapter pcGridAdapter; private PcGridAdapter pcGridAdapter;
private ShortcutHelper shortcutHelper; private ShortcutHelper shortcutHelper;
private ComputerManagerService.ComputerManagerBinder managerBinder; private ComputerManagerService.ComputerManagerBinder managerBinder;
private boolean freezeUpdates, runningPolling, inForeground; private boolean freezeUpdates, runningPolling, inForeground, completeOnCreateCalled;
private final ServiceConnection serviceConnection = new ServiceConnection() { private final ServiceConnection serviceConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName className, IBinder binder) { public void onServiceConnected(ComponentName className, IBinder binder) {
final ComputerManagerService.ComputerManagerBinder localBinder = final ComputerManagerService.ComputerManagerBinder localBinder =
@ -91,11 +91,19 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
} }
}; };
@Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
// Reinitialize views just in case orientation changed // Only reinitialize views if completeOnCreate() was called
initializeViews(); // before this callback. If it was not, completeOnCreate() will
// handle initializing views with the config change accounted for.
// This is not prone to races because both callbacks are invoked
// in the main thread.
if (completeOnCreateCalled) {
// Reinitialize views just in case orientation changed
initializeViews();
}
} }
private final static int APP_LIST_ID = 1; private final static int APP_LIST_ID = 1;
@ -197,6 +205,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
} }
private void completeOnCreate() { private void completeOnCreate() {
completeOnCreateCalled = true;
shortcutHelper = new ShortcutHelper(this); shortcutHelper = new ShortcutHelper(this);
UiHelper.setLocale(this); UiHelper.setLocale(this);