From 8f887c609f1a4a3463838dc4d2dd04dd02690395 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 30 Aug 2021 15:01:45 +0100
Subject: [PATCH 1/3] Enable connect via Bluetooth feature in release builds.

---
 .../main/java/org/briarproject/bramble/api/FeatureFlags.java | 2 --
 .../org/briarproject/bramble/test/TestFeatureFlagModule.java | 5 -----
 .../main/java/org/briarproject/briar/android/AppModule.java  | 5 -----
 .../briar/android/conversation/ConversationActivity.java     | 3 ---
 .../java/org/briarproject/briar/headless/HeadlessModule.kt   | 1 -
 5 files changed, 16 deletions(-)

diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java b/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
index ba06f2a47..094b23edf 100644
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
@@ -11,8 +11,6 @@ public interface FeatureFlags {
 
 	boolean shouldEnableDisappearingMessages();
 
-	boolean shouldEnableConnectViaBluetooth();
-
 	boolean shouldEnableTransferData();
 
 	boolean shouldEnableShareAppViaOfflineHotspot();
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java
index 10e0fc656..aca3c521e 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java
@@ -25,11 +25,6 @@ public class TestFeatureFlagModule {
 				return true;
 			}
 
-			@Override
-			public boolean shouldEnableConnectViaBluetooth() {
-				return true;
-			}
-
 			@Override
 			public boolean shouldEnableTransferData() {
 				return true;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
index a42f19bf5..2b059fa50 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
@@ -313,11 +313,6 @@ public class AppModule {
 				return true;
 			}
 
-			@Override
-			public boolean shouldEnableConnectViaBluetooth() {
-				return IS_DEBUG_BUILD;
-			}
-
 			@Override
 			public boolean shouldEnableTransferData() {
 				return IS_DEBUG_BUILD;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
index 1bac397f9..9426e12cd 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -379,9 +379,6 @@ public class ConversationActivity extends BriarActivity
 						this::showIntroductionOnboarding);
 			}
 		});
-		if (!featureFlags.shouldEnableConnectViaBluetooth()) {
-			menu.findItem(R.id.action_connect_via_bluetooth).setVisible(false);
-		}
 		// Transfer Data feature only supported on API 19+
 		if (SDK_INT >= 19 && featureFlags.shouldEnableTransferData()) {
 			menu.findItem(R.id.action_transfer_data).setVisible(true);
diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
index 079bc4abd..e78797bb2 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
@@ -95,7 +95,6 @@ internal class HeadlessModule(private val appDir: File) {
         override fun shouldEnableImageAttachments() = false
         override fun shouldEnableProfilePictures() = false
         override fun shouldEnableDisappearingMessages() = false
-        override fun shouldEnableConnectViaBluetooth() = false
         override fun shouldEnableTransferData() = false
         override fun shouldEnableShareAppViaOfflineHotspot() = false
     }

From d8267ce5592d43b3e0f7d3e04c652a51973f2f0b Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 30 Aug 2021 15:18:22 +0100
Subject: [PATCH 2/3] Update code style settings.

---
 .idea/codeStyles/Project.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7b9dcd72e..bbd2082a9 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -31,18 +31,8 @@
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value />
       </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <XML>
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
@@ -195,11 +185,5 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
-      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
-      <option name="ENUM_CONSTANTS_WRAP" value="1" />
-    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file

From f3273260bb6e459060d7117d3f4d72563e4b7069 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 31 Aug 2021 14:32:36 +0200
Subject: [PATCH 3/3] Fix Kotlin coding style

---
 .idea/codeStyles/Project.xml                  |  7 ++++++
 .../briar/headless/BriarService.kt            |  2 +-
 .../org/briarproject/briar/headless/Router.kt |  6 ++++-
 .../briar/headless/blogs/OutputBlogPost.kt    | 22 +++++++++----------
 .../headless/contact/OutputPendingContact.kt  |  8 +++++--
 .../briar/headless/ControllerTest.kt          |  7 +++++-
 .../briar/headless/IntegrationTest.kt         | 14 ++++++------
 .../ContactControllerIntegrationTest.kt       |  4 ++--
 .../headless/contact/ContactControllerTest.kt |  7 +++---
 9 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index bbd2082a9..ced0de8ab 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -33,6 +33,7 @@
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <XML>
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
@@ -185,5 +186,11 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt
index c5b2e05ee..18d7c8082 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt
@@ -37,7 +37,7 @@ constructor(
                 ?: throw UsageError("Could not get password. Is STDIN connected?")
             try {
                 accountManager.signIn(password)
-            } catch (e : DecryptionException) {
+            } catch (e: DecryptionException) {
                 echo("Error: Password invalid")
                 exitProcess(1)
             }
diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt
index 598c2a815..579552d43 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt
@@ -3,7 +3,11 @@ package org.briarproject.briar.headless
 import com.fasterxml.jackson.core.JsonParseException
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.javalin.Javalin
-import io.javalin.apibuilder.ApiBuilder.*
+import io.javalin.apibuilder.ApiBuilder.delete
+import io.javalin.apibuilder.ApiBuilder.get
+import io.javalin.apibuilder.ApiBuilder.path
+import io.javalin.apibuilder.ApiBuilder.post
+import io.javalin.apibuilder.ApiBuilder.put
 import io.javalin.core.security.AccessManager
 import io.javalin.core.util.Header.AUTHORIZATION
 import io.javalin.http.BadRequestResponse
diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/blogs/OutputBlogPost.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/blogs/OutputBlogPost.kt
index af9ea2ab4..9f6e22b0c 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/blogs/OutputBlogPost.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/blogs/OutputBlogPost.kt
@@ -6,16 +6,16 @@ import org.briarproject.briar.api.blog.MessageType
 import org.briarproject.briar.headless.json.JsonDict
 
 internal fun BlogPostHeader.output(text: String) = JsonDict(
-        "text" to text,
-        "author" to author.output(),
-        "authorStatus" to authorInfo.status.output(),
-        "type" to type.output(),
-        "id" to id.bytes,
-        "parentId" to parentId?.bytes,
-        "read" to isRead,
-        "rssFeed" to isRssFeed,
-        "timestamp" to timestamp,
-        "timestampReceived" to timeReceived
-    )
+    "text" to text,
+    "author" to author.output(),
+    "authorStatus" to authorInfo.status.output(),
+    "type" to type.output(),
+    "id" to id.bytes,
+    "parentId" to parentId?.bytes,
+    "read" to isRead,
+    "rssFeed" to isRssFeed,
+    "timestamp" to timestamp,
+    "timestampReceived" to timeReceived
+)
 
 internal fun MessageType.output() = name.toLowerCase()
diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt
index 429edb44f..eecfba929 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputPendingContact.kt
@@ -2,7 +2,11 @@ package org.briarproject.briar.headless.contact
 
 import org.briarproject.bramble.api.contact.PendingContact
 import org.briarproject.bramble.api.contact.PendingContactState
-import org.briarproject.bramble.api.contact.PendingContactState.*
+import org.briarproject.bramble.api.contact.PendingContactState.ADDING_CONTACT
+import org.briarproject.bramble.api.contact.PendingContactState.CONNECTING
+import org.briarproject.bramble.api.contact.PendingContactState.FAILED
+import org.briarproject.bramble.api.contact.PendingContactState.OFFLINE
+import org.briarproject.bramble.api.contact.PendingContactState.WAITING_FOR_CONNECTION
 import org.briarproject.bramble.api.contact.event.PendingContactAddedEvent
 import org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent
 import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent
@@ -14,7 +18,7 @@ internal fun PendingContact.output() = JsonDict(
     "timestamp" to timestamp
 )
 
-internal fun PendingContactState.output() = when(this) {
+internal fun PendingContactState.output() = when (this) {
     WAITING_FOR_CONNECTION -> "waiting_for_connection"
     OFFLINE -> "offline"
     CONNECTING -> "connecting"
diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/ControllerTest.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/ControllerTest.kt
index c7d2a6aaf..a143f1ca5 100644
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/ControllerTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/ControllerTest.kt
@@ -14,7 +14,12 @@ import org.briarproject.bramble.api.identity.LocalAuthor
 import org.briarproject.bramble.api.sync.Group
 import org.briarproject.bramble.api.sync.Message
 import org.briarproject.bramble.api.system.Clock
-import org.briarproject.bramble.test.TestUtils.*
+import org.briarproject.bramble.test.TestUtils.getAuthor
+import org.briarproject.bramble.test.TestUtils.getClientId
+import org.briarproject.bramble.test.TestUtils.getContact
+import org.briarproject.bramble.test.TestUtils.getGroup
+import org.briarproject.bramble.test.TestUtils.getLocalAuthor
+import org.briarproject.bramble.test.TestUtils.getMessage
 import org.briarproject.bramble.util.StringUtils.getRandomString
 import org.briarproject.briar.api.conversation.ConversationManager
 import org.briarproject.briar.headless.event.WebSocketController
diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/IntegrationTest.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/IntegrationTest.kt
index 6963fe91e..ac26ea72d 100644
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/IntegrationTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/IntegrationTest.kt
@@ -48,31 +48,31 @@ abstract class IntegrationTest {
         dataDir.deleteRecursively()
     }
 
-    protected fun get(url: String) : Response {
+    protected fun get(url: String): Response {
         return khttp.get(url, getAuthTokenHeader(token))
     }
 
-    protected fun getWithWrongToken(url: String) : Response {
+    protected fun getWithWrongToken(url: String): Response {
         return khttp.get(url, getAuthTokenHeader("wrongToken"))
     }
 
-    protected fun post(url: String, data: String) : Response {
+    protected fun post(url: String, data: String): Response {
         return khttp.post(url, getAuthTokenHeader(token), data = data)
     }
 
-    protected fun postWithWrongToken(url: String) : Response {
+    protected fun postWithWrongToken(url: String): Response {
         return khttp.post(url, getAuthTokenHeader("wrongToken"), data = "")
     }
 
-    protected fun delete(url: String) : Response {
+    protected fun delete(url: String): Response {
         return khttp.delete(url, getAuthTokenHeader(token))
     }
 
-    protected fun delete(url: String, data: String) : Response {
+    protected fun delete(url: String, data: String): Response {
         return khttp.delete(url, getAuthTokenHeader(token), data = data)
     }
 
-    protected fun deleteWithWrongToken(url: String) : Response {
+    protected fun deleteWithWrongToken(url: String): Response {
         return khttp.delete(url, getAuthTokenHeader("wrongToken"))
     }
 
diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerIntegrationTest.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerIntegrationTest.kt
index dca4e336d..9c4cfcc2a 100644
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerIntegrationTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerIntegrationTest.kt
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
-class ContactControllerIntegrationTest: IntegrationTest() {
+class ContactControllerIntegrationTest : IntegrationTest() {
 
     @Test
     fun `returning list of contacts needs authentication token`() {
@@ -24,7 +24,7 @@ class ContactControllerIntegrationTest: IntegrationTest() {
         assertEquals(0, response.jsonArray.length())
 
         // add one test contact
-        val testContactName= "testContactName"
+        val testContactName = "testContactName"
         testDataCreator.addContact(testContactName, true, false)
 
         // retrieve list with one test contact
diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt
index 1f4c75cca..1da24ee6f 100644
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt
@@ -1,8 +1,6 @@
 package org.briarproject.briar.headless.contact
 
 import io.javalin.http.BadRequestResponse
-import io.javalin.http.ForbiddenResponse
-import io.javalin.http.HttpResponseException
 import io.javalin.http.NotFoundResponse
 import io.javalin.plugin.json.JavalinJson.toJson
 import io.mockk.Runs
@@ -35,7 +33,6 @@ import org.briarproject.bramble.util.StringUtils.getRandomString
 import org.briarproject.briar.headless.ControllerTest
 import org.briarproject.briar.headless.getFromJson
 import org.briarproject.briar.headless.json.JsonDict
-import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
@@ -316,7 +313,9 @@ internal class ContactControllerTest : ControllerTest() {
     fun testSetContactAliasInvalid() {
         mockkStatic("org.briarproject.briar.headless.RouterKt")
         every { ctx.pathParam("contactId") } returns "1"
-        every { ctx.getFromJson(objectMapper, "alias") } returns getRandomString(MAX_AUTHOR_NAME_LENGTH + 1)
+        every {
+            ctx.getFromJson(objectMapper, "alias")
+        } returns getRandomString(MAX_AUTHOR_NAME_LENGTH + 1)
         assertThrows(BadRequestResponse::class.java) {
             controller.setContactAlias(ctx)
         }