mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-04 08:05:10 +00:00
Code Issues Releases Wiki Activity

Fixed NPE because frag.device was null

Browse Source 
Why was this starting two RunCommand threads? Exec order is not guaranteed.
This commit is contained in:
Albert Vaca
2017-02-05 15:42:03 +01:00
parent a5a4b360ae
commit a6bd803df8
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
View File

@@ -478,16 +478,11 @@ public class DeviceFragment extends Fragment {
dev.addPairingCallback(frag.pairingCallback); dev.addPairingCallback(frag.pairingCallback);
dev.addPluginsChangedListener(frag.pluginsChangedListener); dev.addPluginsChangedListener(frag.pluginsChangedListener);
frag.device = dev;
frag.device.acceptPairing();
frag.refreshUI(); frag.refreshUI();
frag.device = dev;
}
});
BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
@Override
public void onServiceStart(BackgroundService service) {
frag.device.acceptPairing();
} }
}); });
} }
@@ -502,19 +497,15 @@ public class DeviceFragment extends Fragment {
dev.addPairingCallback(frag.pairingCallback); dev.addPairingCallback(frag.pairingCallback);
dev.addPluginsChangedListener(frag.pluginsChangedListener); dev.addPluginsChangedListener(frag.pluginsChangedListener);
frag.refreshUI();
frag.device = dev; frag.device = dev;
}
});
BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
@Override
public void onServiceStart(BackgroundService service) {
//Remove listener so buttons don't show for a while before changing the view //Remove listener so buttons don't show for a while before changing the view
frag.device.removePluginsChangedListener(frag.pluginsChangedListener); frag.device.removePluginsChangedListener(frag.pluginsChangedListener);
frag.device.removePairingCallback(frag.pairingCallback); frag.device.removePairingCallback(frag.pairingCallback);
frag.device.rejectPairing(); frag.device.rejectPairing();
activity.onDeviceSelected(null); activity.onDeviceSelected(null);
frag.refreshUI();
} }
}); });
} }