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

Change OptionalQRCodeInfo to data class #26849

Merged
merged 1 commit into from
May 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
*
* Copyright (c) 2023 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package chip.onboardingpayload

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
*
* Copyright (c) 2023 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package chip.onboardingpayload

/** Class to hold the data from the scanned QR code or Manual Pairing Code. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
*
* Copyright (c) 2023 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package chip.onboardingpayload

import java.util.logging.Level
Expand Down Expand Up @@ -55,11 +72,11 @@ class OnboardingPayloadParser {

/** Get QR code string from [OnboardingPayload]. */
@Throws(OnboardingPayloadException::class)
external fun getQrCodeFromPayload(payload: OnboardingPayload): String?
external fun getQrCodeFromPayload(payload: OnboardingPayload): String

/** Get Manual Pairing Code string from [OnboardingPayload]. */
@Throws(OnboardingPayloadException::class)
external fun getManualPairingCodeFromPayload(payload: OnboardingPayload): String?
external fun getManualPairingCodeFromPayload(payload: OnboardingPayload): String

@Throws(UnrecognizedQrCodeException::class, OnboardingPayloadException::class)
private external fun fetchPayloadFromQrCode(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
/*
*
* Copyright (c) 2023 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package chip.onboardingpayload

class OptionalQRCodeInfo {
data class OptionalQRCodeInfo(
var tag: Int = 0,
var type: OptionalQRCodeInfoType = OptionalQRCodeInfoType.TYPE_UNKNOWN,
var data: String? = null,
var int32: Int = 0
) {
enum class OptionalQRCodeInfoType {
TYPE_UNKNOWN,
TYPE_STRING,
Expand All @@ -9,9 +31,4 @@ class OptionalQRCodeInfo {
TYPE_UINT32,
TYPE_UINT64
}

var tag = 0
var type: OptionalQRCodeInfoType? = null
var data: String? = null
var int32 = 0
}