Kaydet (Commit) ad34704a authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Jan Holesovsky

sdremote - don't let incoming thumbnails crash us if we switched view.

Signed-off-by: 's avatarJan Holesovsky <kendy@suse.cz>
üst e577ebc9
...@@ -148,7 +148,8 @@ public class PresentationFragment extends SherlockFragment { ...@@ -148,7 +148,8 @@ public class PresentationFragment extends SherlockFragment {
LocalBroadcastManager LocalBroadcastManager
.getInstance(getActivity().getApplicationContext()) .getInstance(getActivity().getApplicationContext())
.unregisterReceiver(mListener); .unregisterReceiver(mListener);
mTopView = null;
mContext = null;
} }
private void updateSlideNumberDisplay(int aPosition) { private void updateSlideNumberDisplay(int aPosition) {
...@@ -259,6 +260,9 @@ public class PresentationFragment extends SherlockFragment { ...@@ -259,6 +260,9 @@ public class PresentationFragment extends SherlockFragment {
@Override @Override
public void onReceive(Context aContext, Intent aIntent) { public void onReceive(Context aContext, Intent aIntent) {
if (mTopView == null || mTopView.getAdapter() == null)
return;
if (aIntent.getAction().equals( if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_CHANGED)) { CommunicationService.MSG_SLIDE_CHANGED)) {
int aSlide = aIntent.getExtras().getInt("slide_number"); int aSlide = aIntent.getExtras().getInt("slide_number");
...@@ -271,10 +275,8 @@ public class PresentationFragment extends SherlockFragment { ...@@ -271,10 +275,8 @@ public class PresentationFragment extends SherlockFragment {
mTopView.setSelection(aSlide, true); mTopView.setSelection(aSlide, true);
} else if (aIntent.getAction().equals( } else if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_PREVIEW)) { CommunicationService.MSG_SLIDE_PREVIEW)) {
// int aNSlide = aIntent.getExtras().getInt("slide_number"); ThumbnailAdapter aThumbAdaptor = (ThumbnailAdapter) mTopView.getAdapter();
((ThumbnailAdapter) mTopView.getAdapter()) aThumbAdaptor.notifyDataSetChanged();
.notifyDataSetChanged();
// mTopView.requestLayout();
} else if (aIntent.getAction().equals( } else if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_NOTES)) { CommunicationService.MSG_SLIDE_NOTES)) {
int aPosition = aIntent.getExtras().getInt("slide_number"); int aPosition = aIntent.getExtras().getInt("slide_number");
......
...@@ -155,6 +155,8 @@ public class ThumbnailFragment extends SherlockFragment { ...@@ -155,6 +155,8 @@ public class ThumbnailFragment extends SherlockFragment {
@Override @Override
public void onReceive(Context aContext, Intent aIntent) { public void onReceive(Context aContext, Intent aIntent) {
if (mGrid == null)
return;
if (aIntent.getAction().equals( if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_CHANGED)) { CommunicationService.MSG_SLIDE_CHANGED)) {
int aSlide = aIntent.getExtras().getInt("slide_number"); int aSlide = aIntent.getExtras().getInt("slide_number");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment