From dd16e61b2b8997fcc147947cb1e70974da7f0302 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 10 Feb 2014 16:12:53 +0000
Subject: [PATCH] Use correct request code when retrying Bluetooth connection.
---
.../briarproject/android/invitation/CodesDoNotMatchView.java | 3 ++-
.../briarproject/android/invitation/ConnectionFailedView.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/invitation/CodesDoNotMatchView.java b/briar-android/src/org/briarproject/android/invitation/CodesDoNotMatchView.java
index fc7d1d0198..f7b8f20469 100644
--- a/briar-android/src/org/briarproject/android/invitation/CodesDoNotMatchView.java
+++ b/briar-android/src/org/briarproject/android/invitation/CodesDoNotMatchView.java
@@ -3,6 +3,7 @@ package org.briarproject.android.invitation;
import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE;
import static android.bluetooth.BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION;
import static android.view.Gravity.CENTER;
+import static org.briarproject.android.invitation.AddContactActivity.REQUEST_BLUETOOTH;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import org.briarproject.R;
@@ -57,6 +58,6 @@ class CodesDoNotMatchView extends AddContactView implements OnClickListener {
public void onClick(View view) {
Intent i = new Intent(ACTION_REQUEST_DISCOVERABLE);
i.putExtra(EXTRA_DISCOVERABLE_DURATION, 120);
- container.startActivityForResult(i, 0);
+ container.startActivityForResult(i, REQUEST_BLUETOOTH);
}
}
diff --git a/briar-android/src/org/briarproject/android/invitation/ConnectionFailedView.java b/briar-android/src/org/briarproject/android/invitation/ConnectionFailedView.java
index b13f10297e..05f6dd954b 100644
--- a/briar-android/src/org/briarproject/android/invitation/ConnectionFailedView.java
+++ b/briar-android/src/org/briarproject/android/invitation/ConnectionFailedView.java
@@ -3,6 +3,7 @@ package org.briarproject.android.invitation;
import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE;
import static android.bluetooth.BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION;
import static android.view.Gravity.CENTER;
+import static org.briarproject.android.invitation.AddContactActivity.REQUEST_BLUETOOTH;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import org.briarproject.R;
@@ -59,6 +60,6 @@ class ConnectionFailedView extends AddContactView implements OnClickListener {
public void onClick(View view) {
Intent i = new Intent(ACTION_REQUEST_DISCOVERABLE);
i.putExtra(EXTRA_DISCOVERABLE_DURATION, 120);
- container.startActivityForResult(i, 0);
+ container.startActivityForResult(i, REQUEST_BLUETOOTH);
}
}
--
GitLab