diff options
| author | Artur Dryomov <artur.dryomov@gmail.com> | 2013-07-14 22:44:58 +0300 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-07-25 18:01:55 +0100 |
| commit | 7ab7e72e8672dccc1380aff54480eed86b469b90 (patch) | |
| tree | 9033062e21d7a47c108a487664324a9469eeaae1 /android | |
| parent | Move pairing operations from CommunicationService to a PairingProvider. (diff) | |
| download | core-7ab7e72e8672dccc1380aff54480eed86b469b90.tar.gz core-7ab7e72e8672dccc1380aff54480eed86b469b90.zip | |
Fix intent creation to use the static factory class.
Change-Id: I7c9cd2ab8a0d185e7ace7d7f9c0183775b620178
Diffstat (limited to 'android')
3 files changed, 11 insertions, 3 deletions
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java b/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java index 2c294a591393..20a289a50a55 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java @@ -293,7 +293,7 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo } private void callComputerCreationActivity() { - Intent aIntent = new Intent(getActivity(), ComputerCreationActivity.class); + Intent aIntent = Intents.buildComputerCreationIntent(getActivity()); startActivityForResult(aIntent, Intents.RequestCodes.CREATE_SERVER); } diff --git a/android/sdremote/src/org/libreoffice/impressremote/Intents.java b/android/sdremote/src/org/libreoffice/impressremote/Intents.java index 93d71cb1c5c0..344175d08752 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/Intents.java +++ b/android/sdremote/src/org/libreoffice/impressremote/Intents.java @@ -1,3 +1,11 @@ +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ package org.libreoffice.impressremote; import android.content.Context; @@ -120,3 +128,5 @@ public final class Intents { return new Intent(aContext, LicensesActivity.class); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java index 9b2f47ae2a1a..fa9768a8bb55 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java @@ -14,12 +14,10 @@ import android.app.Service; import android.bluetooth.BluetoothAdapter; import android.content.Intent; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.support.v4.content.LocalBroadcastManager; import org.libreoffice.impressremote.Intents; -import org.libreoffice.impressremote.Preferences; public class CommunicationService extends Service implements Runnable, MessagesListener { public static enum State { |