android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java |
12 +++++-----
android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java |
4 ++-
2 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 8db1ba5d22fe8b1b528f5873480e4db1b1f33d4c
Author: Michael Meeks <michael.me...@suse.com>
Date: Wed Jan 30 19:42:32 2013 +1100
sdremote - don't let incoming thumbnails crash us if we switched view.
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 555d3e1..9ad3b79 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -148,7 +148,8 @@ public class PresentationFragment extends SherlockFragment {
LocalBroadcastManager
.getInstance(getActivity().getApplicationContext())
.unregisterReceiver(mListener);
-
+ mTopView = null;
+ mContext = null;
}
private void updateSlideNumberDisplay(int aPosition) {
@@ -259,6 +260,9 @@ public class PresentationFragment extends SherlockFragment {
@Override
public void onReceive(Context aContext, Intent aIntent) {
+
+ if (mTopView == null || mTopView.getAdapter() == null)
+ return;
if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_CHANGED)) {
int aSlide = aIntent.getExtras().getInt("slide_number");
@@ -271,10 +275,8 @@ public class PresentationFragment extends SherlockFragment
{
mTopView.setSelection(aSlide, true);
} else if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_PREVIEW)) {
- // int aNSlide = aIntent.getExtras().getInt("slide_number");
- ((ThumbnailAdapter) mTopView.getAdapter())
- .notifyDataSetChanged();
- // mTopView.requestLayout();
+ ThumbnailAdapter aThumbAdaptor = (ThumbnailAdapter)
mTopView.getAdapter();
+ aThumbAdaptor.notifyDataSetChanged();
} else if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_NOTES)) {
int aPosition = aIntent.getExtras().getInt("slide_number");
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
index c7731ee..dace201 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java
@@ -155,6 +155,8 @@ public class ThumbnailFragment extends SherlockFragment {
@Override
public void onReceive(Context aContext, Intent aIntent) {
+ if (mGrid == null)
+ return;
if (aIntent.getAction().equals(
CommunicationService.MSG_SLIDE_CHANGED)) {
int aSlide = aIntent.getExtras().getInt("slide_number");
@@ -234,4 +236,4 @@ public class ThumbnailFragment extends SherlockFragment {
}
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
