diff options
Diffstat (limited to 'android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java')
-rw-r--r-- | android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java index 955459c5c3e9..c4a097ef6f70 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java @@ -10,9 +10,6 @@ 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; @@ -46,19 +43,24 @@ 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(mContext.getApplicationContext(), - PresentationActivity.class); - aIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - mContext.getApplicationContext().startActivity(aIntent); + // Intent aIntent = new Intent(mContext.getApplicationContext(), + // PresentationActivity.class); + // aIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + // aIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); + // mContext.getApplicationContext().startActivity(aIntent); + Intent aIntent = new Intent( + CommunicationService.STATUS_CONNECTED_SLIDESHOW_RUNNING); + LocalBroadcastManager.getInstance(mContext).sendBroadcast(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); + // Intent aIntent = new Intent(mContext.getApplicationContext(), + // StartPresentationActivity.class); + // aIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + // aIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); + // mContext.getApplicationContext().startActivity(aIntent); + Intent aIntent = new Intent( + CommunicationService.STATUS_CONNECTED_NOSLIDESHOW); + LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent); } else { if (mSlideShow == null) return; |