diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 95bde2570..99292210f 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -157,13 +157,13 @@
You have asked to introduce %1$s to %2$s.
%1$s has asked to introduce you to %2$s. Do you want to add %2$s to your contact list?
%1$s has asked to introduce you to %2$s, but %2$s is already in your contact list. Since %1$s might not know that, you can still respond:
- %1$s has asked to introduce you to %2$s, but %2$s is one of your other identities. For that reason you cannot accept the introduction:
+ %1$s has asked to introduce you to %2$s, but %2$s is one of your other identities, so you cannot accept the introduction:
%1$s has asked to introduce you to %2$s.
You accepted the introduction to %1$s.
You declined the introduction to %1$s.
- %1$s accepted to be introduced to %2$s.
- %1$s declined to be introduced to %2$s.
- %1$s has informed us that %2$s has declined the introduction.
+ %1$s accepted the introduction to %2$s.
+ %1$s declined the introduction to %2$s.
+ %1$s says that %2$s declined the introduction.
Introduced contact was added
You have been introduced to %1$s.
diff --git a/briar-core/src/org/briarproject/introduction/IntroduceeEngine.java b/briar-core/src/org/briarproject/introduction/IntroduceeEngine.java
index cb1ee7e02..3f29b00b0 100644
--- a/briar-core/src/org/briarproject/introduction/IntroduceeEngine.java
+++ b/briar-core/src/org/briarproject/introduction/IntroduceeEngine.java
@@ -26,8 +26,6 @@ import static org.briarproject.api.introduction.IntroduceeAction.LOCAL_ABORT;
import static org.briarproject.api.introduction.IntroduceeAction.LOCAL_ACCEPT;
import static org.briarproject.api.introduction.IntroduceeAction.LOCAL_DECLINE;
import static org.briarproject.api.introduction.IntroduceeAction.REMOTE_ABORT;
-import static org.briarproject.api.introduction.IntroduceeAction.REMOTE_ACCEPT;
-import static org.briarproject.api.introduction.IntroduceeAction.REMOTE_DECLINE;
import static org.briarproject.api.introduction.IntroduceeProtocolState.AWAIT_ACK;
import static org.briarproject.api.introduction.IntroduceeProtocolState.AWAIT_REMOTE_RESPONSE;
import static org.briarproject.api.introduction.IntroduceeProtocolState.AWAIT_REQUEST;
@@ -199,8 +197,9 @@ public class IntroduceeEngine
// we are done (probably declined response), ignore & delete message
else if (currentState == FINISHED) {
return new StateUpdate(true,
- false, localState, new ArrayList(0),
- new ArrayList(0));
+ false, localState,
+ Collections.emptyList(),
+ Collections.emptyList());
}
// this should not happen
else {
@@ -377,8 +376,7 @@ public class IntroduceeEngine
BdfDictionary localState) throws FormatException {
return new StateUpdate(false, false,
- localState, new ArrayList(0),
- new ArrayList(0));
+ localState, Collections.emptyList(),
+ Collections.emptyList());
}
-
}
diff --git a/briar-core/src/org/briarproject/introduction/IntroducerEngine.java b/briar-core/src/org/briarproject/introduction/IntroducerEngine.java
index 6af05d14b..e0e1449f6 100644
--- a/briar-core/src/org/briarproject/introduction/IntroducerEngine.java
+++ b/briar-core/src/org/briarproject/introduction/IntroducerEngine.java
@@ -388,8 +388,7 @@ public class IntroducerEngine
BdfDictionary localState) throws FormatException {
return new StateUpdate(false, false,
- localState, new ArrayList(0),
- new ArrayList(0));
+ localState, Collections.emptyList(),
+ Collections.emptyList());
}
-
}