From 9f1716173ed8b859326e4d946e5a1909cd62b5fb Mon Sep 17 00:00:00 2001 From: "Andrzej J.R. Hunt" Date: Wed, 29 Aug 2012 12:57:09 +0200 Subject: Return to StartPresentationActivity when slideshow finishes. Change-Id: Id91226046ecb89c2cd14d03eb4a99d0ad4b7b027 --- .../impressremote/communication/Receiver.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'android') diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java index 407540a19721..955459c5c3e9 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java @@ -10,6 +10,9 @@ package org.libreoffice.impressremote.communication; import java.util.ArrayList; +import org.libreoffice.impressremote.PresentationActivity; +import org.libreoffice.impressremote.StartPresentationActivity; + import android.content.Context; import android.content.Intent; import android.support.v4.content.LocalBroadcastManager; @@ -43,9 +46,19 @@ public class Receiver { int aCurrentSlide = Integer.parseInt(aCommand.get(2)); mSlideShow.setLength(aSlideShowlength); mSlideShow.setCurrentSlide(aCurrentSlide); - Intent aIntent = new Intent( - CommunicationService.MSG_SLIDESHOW_STARTED); - LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent); + // Intent aIntent = new Intent( + // CommunicationService.MSG_SLIDESHOW_STARTED); + // LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent); + Intent aIntent = new Intent(mContext.getApplicationContext(), + PresentationActivity.class); + aIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mContext.getApplicationContext().startActivity(aIntent); + } else if (aInstruction.equals("slideshow_finished")) { + mSlideShow = new SlideShow(mContext); + Intent aIntent = new Intent(mContext.getApplicationContext(), + StartPresentationActivity.class); + aIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mContext.getApplicationContext().startActivity(aIntent); } else { if (mSlideShow == null) return; -- cgit