From 4290e3d1e5e3974848b0d13a12defec5ad723bf9 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 1 May 2013 11:54:28 +0100
Subject: [PATCH] Fixed a receiver leak, added a FIXME.
---
.../net/sf/briar/android/invitation/AddContactActivity.java | 4 +++-
.../src/net/sf/briar/android/invitation/CodeEntryWidget.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java b/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
index 1ade68d616..ac063e7c01 100644
--- a/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
+++ b/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
@@ -58,6 +58,7 @@ implements InvitationListener {
private AuthorId localAuthorId = null;
private String networkName = null;
private boolean bluetoothEnabled = false;
+ private BluetoothWifiStateReceiver receiver = null;
private int localInvitationCode = -1, remoteInvitationCode = -1;
private int localConfirmationCode = -1, remoteConfirmationCode = -1;
private boolean connectionFailed = false;
@@ -145,7 +146,7 @@ implements InvitationListener {
filter.addAction(ACTION_STATE_CHANGED);
filter.addAction(ACTION_SCAN_MODE_CHANGED);
filter.addAction(NETWORK_STATE_CHANGED_ACTION);
- BluetoothWifiStateReceiver receiver = new BluetoothWifiStateReceiver();
+ receiver = new BluetoothWifiStateReceiver();
registerReceiver(receiver, filter);
// Get the current Bluetooth and WiFi state
@@ -188,6 +189,7 @@ implements InvitationListener {
public void onDestroy() {
super.onDestroy();
if(task != null) task.removeListener(this);
+ unregisterReceiver(receiver);
unbindService(serviceConnection);
}
diff --git a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java b/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
index d9b2901e91..6685abc36f 100644
--- a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
@@ -54,7 +54,7 @@ implements OnEditorActionListener, OnClickListener {
continueButton.setEnabled(getText().length() == 6);
}
};
- codeEntry.setId(1);
+ codeEntry.setId(1); // FIXME: State is not saved and restored
codeEntry.setTextSize(26);
codeEntry.setOnEditorActionListener(this);
codeEntry.setMinEms(5);
--
GitLab