Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CCAPI ver110 support #184

Closed
wants to merge 4 commits into from

Conversation

benhylau
Copy link
Contributor

This breaks support for cameras activated for ver100, so we may not want to merge as is.

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"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for compiling on M1 Macs.

Comment on lines +13 to +15
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS"
tools:ignore="ProtectedPermissions" />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably unnecessary since I commented out the WiFi network binding.

@@ -63,7 +63,7 @@ suspend fun CanonCameraControlApi.waitUntilConnected(

@JsonClass(generateAdapter = true)
data class Api(
val url: String,
val path: String,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the big breaking change.

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()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This expectedly breaks Internet traffic. Proper fix will come from #22

@benhylau
Copy link
Contributor Author

benhylau commented Jan 18, 2022

This is incorporated into #187 we can close this once #187 is merged. I recommend we merge #187 first then add back compatibility to CCAPI ver100, so all cameras from ver100 and ver101 would work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant