Merge pull request #5 from ssbc/android30

reduce library dependencies to match Android targetSDK 26

Author: jannickheisch

android/README.md

@@ -7,13 +7,4 @@ interface to the replicated tinySSB logs.
 - [tinySSB](tinySSB) -- features chat with voice messaging (Codec2), Kanban boards (collaborative planning), log synchronization via Bluetooth Low Energy (BLE) as well as WebSocket. Thanks to its BLE interface, two devices in the same room can immediately synchronize their tinySSB content, import user IDs etc.
 - more to come here
 
-## Notes
-
-Compiling the ```tinySSB``` app is challenging because of the included
-Codec2 library which must be cross-compiled to native code (for
-Android smartphones). If on Windows you may have to change the file
-```tinySSB/app/src/main/codec2/src/CMakeLists.txt``` and add a
-```.exe``` suffix to a file name, see
-```tinySSB/app/src/main/codec2/src/CMakeLists-for-windows.txt```.
-
 ---

android/tinySSB/.gitignore

@@ -4,3 +4,5 @@
 
 # emacs backup files
 *~
+
+local.properties

android/tinySSB/README.md

@@ -17,8 +17,22 @@ content of the tinySSB app using BLE. This requires that Bluetooth is
 enabled as well as localization (in order to access BLE), and that the
 app is active (no background syncing).
 
-
-## A Note on Security
+## Notes Regarding Compilation
+
+Compiling the ```tinySSB``` app is challenging because of the included
+Codec2 library which must be cross-compiled to native code (for
+Android smartphones). If on Windows you may have to change the file
+```tinySSB/app/src/main/codec2/src/CMakeLists.txt``` and add a
+```.exe``` suffix to a file name, see
+```tinySSB/app/src/main/codec2/src/CMakeLists-for-windows.txt```.
+
+The compilation is currently configured to generate an APK that
+runs on devices in the range of Android 8/Oreo to Android 12 (SDK 26 to 31).
+If an APK should be compiled that can be published via Google Play,
+the minSdkVersion will have to be changed to 30 (instead of 26),
+cutting off at the same time owners of phones with Android 10 or below.
+
+## Note Regarding Security
 
 This is a preliminary version of the app, built mostly for demo
 purposes. As such it lacks some desirable security properties and

android/tinySSB/app/build.gradle

@@ -4,13 +4,13 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 31
+    compileSdk 30
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "nz.scuttlebutt.tremolavossbol"
-        minSdkVersion 24
-        targetSdkVersion 31
+        minSdkVersion 26
+        targetSdkVersion 30
         versionCode 1
         versionName "0.1"
 
@@ -65,40 +65,29 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    // testImplementation 'junit:junit:4.12'
-    // androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    // androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    implementation 'com.squareup.okhttp3:okhttp:4.9.2' //for websocket client
+    // widgets
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
 
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.test.ext:junit-ktx:1.1.5'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'junit:junit:4.12'
-
-    def room_version = "2.2.6"
-
-    // implementation "androidx.room:room-runtime:$room_version"
-    // kapt "androidx.room:room-compiler:$room_version"
-
-    // optional - Kotlin Extensions and Coroutines support for Room
-    // implementation "androidx.room:room-ktx:$room_version"
+    // websocket
+    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
 
+    // QR code
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
     implementation 'com.google.zxing:core:3.4.1'
 
-    //LAZY SODIUM
+    // LAZY SODIUM
     implementation 'com.goterl:lazysodium-android:5.0.2@aar'
     implementation 'net.java.dev.jna:jna:5.9.0@aar'
 
-    //ROOM
-    implementation "androidx.room:room-runtime:2.4.2"
-    kapt "androidx.room:room-compiler:2.4.2"
-    implementation "androidx.room:room-rxjava2:2.4.2"
-    implementation "androidx.room:room-coroutines:2.1.0-alpha04"
-    implementation "androidx.room:room-guava:2.4.2"
+    // database
+    implementation "androidx.room:room-runtime:2.3.0"
+    kapt "androidx.room:room-compiler:2.3.0"
+    // implementation "androidx.room:room-rxjava2:2.3.0"
+    // implementation "androidx.room:room-guava:2.3.0"
 
+    // junit
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+    testImplementation 'junit:junit:4.12'
 }

android/tinySSB/app/src/main/AndroidManifest.xml

@@ -25,16 +25,15 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true">
-        <activity android:name="nz.scuttlebutt.tremolavossbol.PlayActivity"></activity>
-        <activity android:name="nz.scuttlebutt.tremolavossbol.RecordActivity"></activity>
+        android:requestLegacyExternalStorage="true"
+        android:usesCleartextTraffic="true"
+        android:supportsRtl="true" >
+        <activity android:name="nz.scuttlebutt.tremolavossbol.PlayActivity"/>
+        <activity android:name="nz.scuttlebutt.tremolavossbol.RecordActivity"/>
         <activity
             android:name="nz.scuttlebutt.tremolavossbol.MainActivity"
             android:theme="@style/Launcher"

android/tinySSB/app/src/main/java/nz/scuttlebutt/tremolavossbol/MainActivity.kt

@@ -23,7 +23,6 @@ import com.google.zxing.integration.android.IntentIntegrator
 import nz.scuttlebutt.tremolavossbol.crypto.IdStore
 import nz.scuttlebutt.tremolavossbol.tssb.ble.BlePeers
 import nz.scuttlebutt.tremolavossbol.tssb.*
-import nz.scuttlebutt.tremolavossbol.tssb.ble.BlePeersBroadcast
 import nz.scuttlebutt.tremolavossbol.tssb.ble.BluetoothEventListener
 import nz.scuttlebutt.tremolavossbol.utils.Constants
 import tremolavossbol.R
@@ -49,7 +48,6 @@ class MainActivity : Activity() {
     @Volatile var mc_socket: MulticastSocket? = null
     var ble: BlePeers? = null
     var websocket: WebsocketIO? =null
-    //var ble: BlePeersBroadcast? = null
     val ioLock = ReentrantLock()
     var broadcastReceiver: BroadcastReceiver? = null
     var isWifiConnected = false
@@ -298,10 +296,7 @@ class MainActivity : Activity() {
             tremolaState.wai.eval("b2f_new_voice('${voice}')")
         */
         }  else if (requestCode == 555 && resultCode == RESULT_OK) { // enable fine grained location
-            ble!!.startBluetooth()
-
-
-
+            ble?.startBluetooth()
         }
 
         super.onActivityResult(requestCode, resultCode, data)
@@ -317,23 +312,21 @@ class MainActivity : Activity() {
         } catch (e: Exception) {}
         */
 
-        ble = BlePeers(this)
-        ble!!.startBluetooth()
+        try {
+            ble = BlePeers(this)
+            ble?.startBluetooth()
+        } catch (e: Exception) {
+            ble = null
+        }
 
         websocket = WebsocketIO(this, settings!!.getWebsocketUrl())
         websocket!!.start()
-        //ble = BlePeersBroadcast(this)
-        //ble!!.checkPermissions(true)
-        //ble!!.scan()
-
     }
 
     override fun onPause() {
         Log.d("onPause", "")
         super.onPause()
-        if (ble != null) {
-            ble!!.stopBluetooth()
-        }
+        ble?.stopBluetooth()
 
         if (websocket != null)
             websocket!!.stop()
@@ -362,9 +355,7 @@ class MainActivity : Activity() {
         server_socket = null
         */
         super.onDestroy()
-        if (ble != null) {
-            ble!!.stopBluetooth()
-        }
+        ble?.stopBluetooth()
 
         if (websocket != null) {
             websocket!!.stop()

android/tinySSB/app/src/main/res/drawable/icon.png

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_round_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_round_foreground"/>
 </adaptive-icon>