CCAPI ver110 support

CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.8.0 - 2021-10-30
+
+### Added
+
+- Support for CCAPI ver110. This breaks compatibility with devices activated for ver100.
+
+### Changed
+
+#### UI/UX
+
+#### Code Quality
+
 ## 1.7.0 - 2020-10-12
 
 ### Added

app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "io.numbersprotocol.starlingcapture"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 7
-        versionName "1.7.0"
+        versionCode 8
+        versionName "1.8.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -117,9 +117,10 @@ dependencies {
     implementation "androidx.navigation:navigation-fragment-ktx:2.3.0"
     implementation "androidx.navigation:navigation-ui-ktx:2.3.0"
 
-    implementation "androidx.room:room-runtime:2.2.5"
-    implementation "androidx.room:room-ktx:2.2.5"
-    kapt "androidx.room:room-compiler:2.2.5"
+    implementation "androidx.room:room-runtime:2.3.0"
+    implementation "androidx.room:room-ktx:2.3.0"
+    kapt "androidx.room:room-compiler:2.3.0"
+    kapt "org.xerial:sqlite-jdbc:3.34.0"
 
     implementation "com.google.android.material:material:1.3.0-alpha03"
 

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="io.numbersprotocol.starlingcapture">
 
     <uses-feature
@@ -9,6 +10,10 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
+
 
     <application
         android:name=".BaseApplication"

app/src/main/java/io/numbersprotocol/starlingcapture/source/canon/CanonCameraControlApi.kt

@@ -63,7 +63,7 @@ suspend fun CanonCameraControlApi.waitUntilConnected(
 
 @JsonClass(generateAdapter = true)
 data class Api(
-    val url: String,
+    val path: String,
     val get: Boolean,
     val post: Boolean,
     val put: Boolean,

app/src/main/java/io/numbersprotocol/starlingcapture/source/canon/CanonCameraControlService.kt

@@ -1,7 +1,12 @@
 package io.numbersprotocol.starlingcapture.source.canon
 
 import android.app.Service
+import android.content.Context
 import android.content.Intent
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
 import androidx.core.app.NotificationCompat
 import io.numbersprotocol.starlingcapture.R
 import io.numbersprotocol.starlingcapture.collector.ProofCollector
@@ -21,21 +26,39 @@ class CanonCameraControlService : Service(), CoroutineScope by CoroutineScope(Di
     private val notificationUtil: NotificationUtil by inject()
     private val foregroundNotificationId = notificationUtil.createNotificationId()
     private val errorNotificationId = notificationUtil.createNotificationId()
+    private lateinit var address: String
     private lateinit var canonCameraControlApi: CanonCameraControlApi
     private val proofCollector: ProofCollector by inject()
     private lateinit var foregroundNotificationBuilder: NotificationCompat.Builder
     private val beforeDestroyCallbacks = mutableSetOf<() -> Unit>()
 
     @FlowPreview
     override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+//        bindProcessToWiFiNetwork()
         initializeCanonCameraControlApi(intent)
         startForeground()
         connectToCamera()
         return super.onStartCommand(intent, flags, startId)
     }
 
+    /**
+     * Default to WiFi network transport (even when Internet in unavailable on that interface) since
+     * our camera has no Internet connectivity. This tells Android to still connect to the local IP
+     * when mobile data is available on the phone.
+     */
+    private fun bindProcessToWiFiNetwork() {
+        val connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val request = NetworkRequest.Builder().addTransportType(NetworkCapabilities.TRANSPORT_WIFI).build()
+        val networkCallback = object : ConnectivityManager.NetworkCallback() {
+            override fun onAvailable(network: Network) {
+                connectivityManager.bindProcessToNetwork(network)
+            }
+        }
+        connectivityManager?.requestNetwork(request, networkCallback)
+    }
+
     private fun initializeCanonCameraControlApi(intent: Intent) {
-        val address = intent.extras!!.getString(CAMERA_ADDRESS)!!
+        address = intent.extras!!.getString(CAMERA_ADDRESS)!!
         canonCameraControlApi = CanonCameraControlApi.create(address)
     }
 
@@ -52,6 +75,7 @@ class CanonCameraControlService : Service(), CoroutineScope by CoroutineScope(Di
 
     @FlowPreview
     private fun connectToCamera() = launch {
+        Timber.v("Connecting to camera...")
         canonCameraControlApi.waitUntilConnected { e ->
             if (e !is CancellationException) {
                 notificationUtil.notifyException(e, foregroundNotificationId)
@@ -80,20 +104,25 @@ class CanonCameraControlService : Service(), CoroutineScope by CoroutineScope(Di
         }
     }
 
-    private fun getContentFlow(url: String) = flow {
+    private fun getContentFlow(path: String) = flow {
+        val url = "http://$address$path"
+        Timber.v("Getting content stream at $url")
         emit(MediaStream(canonCameraControlApi.getContent(url).byteStream(), MimeType.fromUrl(url)))
     }.retry { e ->
         (e is HttpException && e.code() == 503).also {
+            Timber.e("Getting content stream failed with error: %s", e.message)
             Timber.w("Service is currently unavailable. Is the shooting processing in progress?")
             delay(POLLING_INTERVAL_MILLIS)
         }
     }
 
     private suspend fun storeAndCollect(mediaStream: MediaStream) {
+        Timber.v("Storing new content...")
         val cachedFile = createCachedFile(mediaStream)
         cachedFile.copyFromInputStream(mediaStream.inputStream)
         proofCollector.storeAndCollect(cachedFile, mediaStream.mimeType)
         cachedFile.delete()
+        Timber.i("New content stored.")
     }
 
     private fun createCachedFile(mediaStream: MediaStream) = File.createTempFile(