android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
| 8 +++-----
android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
| 10 +---------
2 files changed, 4 insertions(+), 14 deletions(-)
New commits:
commit 3c4e6de591e6bfef165f16bf67dfb049f4a017ba
Author: Andrzej J.R. Hunt <[email protected]>
Date: Mon Aug 20 08:41:42 2012 +0200
Further ABS/Android 2 related compatibility fixes.
Change-Id: I1689cb26253581ba595e67df47b3d6220d751dad
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
index 8fb4298..a239312 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
@@ -25,7 +25,6 @@ import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
-import android.support.v4.content.LocalBroadcastManager;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.LinearLayout;
@@ -49,8 +48,7 @@ public class SelectorActivity extends Activity {
IntentFilter aFilter = new IntentFilter(
CommunicationService.MSG_SERVERLIST_CHANGED);
- LocalBroadcastManager.getInstance(this).registerReceiver(mListener,
- aFilter);
+ registerReceiver(mListener, aFilter);
mBluetoothContainer = findViewById(R.id.selector_container_bluetooth);
mBluetoothList = (LinearLayout)
findViewById(R.id.selector_list_bluetooth);
@@ -64,7 +62,7 @@ public class SelectorActivity extends Activity {
@Override
protected void onDestroy() {
super.onDestroy();
- LocalBroadcastManager.getInstance(this).unregisterReceiver(mListener);
+ unregisterReceiver(mListener);
}
@Override
@@ -168,7 +166,7 @@ public class SelectorActivity extends Activity {
aText.setOnClickListener(mClickListener);
aText.setText(aServer.getName());
aLayout.addView(aView);
- aMap.put(aServer, aText);
+ aMap.put(aServer, aView);
}
}
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
index 4b7edbd..7405a25 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
@@ -8,8 +8,6 @@ import java.net.InetAddress;
import java.net.SocketException;
import java.util.HashMap;
-import org.libreoffice.impressremote.communication.Server.Protocol;
-
import android.content.Context;
import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
@@ -77,8 +75,7 @@ public class ServerFinder {
Intent aIntent = new Intent(
CommunicationService.MSG_SERVERLIST_CHANGED);
- LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent);
-
+ mContext.sendBroadcast(aIntent);
} catch (java.net.SocketTimeoutException e) {
// Ignore -- we want to timeout to enable checking whether we
// should stop listening periodically
@@ -95,11 +92,6 @@ public class ServerFinder {
mFinishRequested = false;
- // TODO: Remove for production
- mServerList.put("10.0.2.2",
- new Server(Protocol.NETWORK, "10.0.2.2",
- "Android Emulator Localhost", System
- .currentTimeMillis()));
Intent aIntent = new
Intent(CommunicationService.MSG_SERVERLIST_CHANGED);
LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent);
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
