[android] remove openthread commissioner (#7242)

project-chip · Aug 21, 2021 · 2488104 · 2488104
1 parent fc41ed5
commit 2488104
Show file tree

Hide file tree

Showing 39 changed files with 0 additions and 2,345 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -42,10 +42,6 @@
 	path = third_party/bluez/repo
 	url = https://github.com/bluez/bluez.git
 	branch = master
-[submodule "ot-commissioner"]
-	path = third_party/ot-commissioner/repo
-	url = https://github.com/openthread/ot-commissioner
-	branch = main
 [submodule "cirque"]
 	path = third_party/cirque/repo
 	url = https://github.com/openweave/cirque.git

diff --git a/.restyled.yaml b/.restyled.yaml
@@ -63,7 +63,6 @@ exclude:
     - "third_party/openthread/repo/**/*"
     - "third_party/ot-br-posix/repo/**/*"
     - "third_party/bluez/repo/**/*"
-    - "third_party/ot-commissioner/repo/**/*"
     - "third_party/cirque/repo/**/*"
     - "third_party/nanopb/repo/**/*"
 

diff --git a/scripts/examples/android_app.sh b/scripts/examples/android_app.sh
@@ -42,7 +42,3 @@ ninja -C out/"android_$TARGET_CPU" src/setup_payload/java src/controller/java de
 
 rsync -a out/"android_$TARGET_CPU"/lib/*.jar src/android/CHIPTool/app/libs
 rsync -a out/"android_$TARGET_CPU"/lib/jni/* src/android/CHIPTool/app/src/main/jniLibs
-
-# Build ot-commissioner libs
-git submodule update --init --recursive third_party/ot-commissioner/repo
-TARGET_CPU=arm64 ./third_party/ot-commissioner/build-android-libs.sh
diff --git a/src/android/CHIPTool/README.md b/src/android/CHIPTool/README.md
@@ -42,7 +42,6 @@ Complete the following steps to build CHIPTool:
 2. In the command line, run the following command from the top CHIP directory:
 
     ```shell
-    sudo apt-get install -y swig # "brew install swig" for macOS.
     TARGET_CPU=arm64 ./scripts/examples/android_app.sh
     ```
 

diff --git a/src/android/CHIPTool/app/src/main/AndroidManifest.xml b/src/android/CHIPTool/app/src/main/AndroidManifest.xml
@@ -31,11 +31,6 @@
                 <data android:scheme="ch" /><!-- Process CHIP URIs -->
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.google.chip.chiptool.commissioner.CommissionerActivity"
-            android:label="@string/commissioner_name"
-            android:exported="false">
-        </activity>
     </application>
 
     <queries>

diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
@@ -29,7 +29,6 @@ import androidx.fragment.app.Fragment
 import chip.setuppayload.SetupPayloadParser.UnrecognizedQrCodeException
 import com.google.chip.chiptool.attestation.AttestationTestFragment
 import com.google.chip.chiptool.clusterclient.OnOffClientFragment
-import com.google.chip.chiptool.commissioner.CommissionerActivity
 import com.google.chip.chiptool.echoclient.EchoClientFragment
 import com.google.chip.chiptool.provisioning.DeviceProvisioningFragment
 import com.google.chip.chiptool.provisioning.ProvisionNetworkType
@@ -106,11 +105,6 @@ class CHIPToolActivity :
     showFragment(BarcodeFragment.newInstance(), false)
   }
 
-  override fun handleCommissioningClicked() {
-    var intent = Intent(this, CommissionerActivity::class.java)
-    startActivityForResult(intent, REQUEST_CODE_COMMISSIONING)
-  }
-
   override fun handleEchoClientClicked() {
     showFragment(EchoClientFragment.newInstance())
   }

diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt
@@ -50,7 +50,6 @@ class SelectActionFragment : Fragment() {
         isEnabled = hasLocationPermission()
         setOnClickListener { getCallback()?.onProvisionThreadCredentialsClicked() }
       }
-      otCommissioningBtn.setOnClickListener { getCallback()?.handleCommissioningClicked() }
       echoClientBtn.setOnClickListener { getCallback()?.handleEchoClientClicked() }
       onOffClusterBtn.setOnClickListener { getCallback()?.handleOnOffClicked() }
       attestationTestBtn.setOnClickListener { getCallback()?.handleAttestationTestClicked() }
@@ -106,8 +105,6 @@ class SelectActionFragment : Fragment() {
     fun onProvisionWifiCredentialsClicked()
     /** Notifies listener of provision-Thread-credentials button click. */
     fun onProvisionThreadCredentialsClicked()
-    /** Notifies listener of Commissioning button click. */
-    fun handleCommissioningClicked()
     /** Notifies listener of Echo client button click. */
     fun handleEchoClientClicked()
     /** Notifies listener of send command button click. */

diff --git a/...HIPTool/app/src/main/java/com/google/chip/chiptool/commissioner/CommissionerActivity.java b/...HIPTool/app/src/main/java/com/google/chip/chiptool/commissioner/CommissionerActivity.java
diff --git a/...d/CHIPTool/app/src/main/java/com/google/chip/chiptool/commissioner/NetworkCredential.java b/...d/CHIPTool/app/src/main/java/com/google/chip/chiptool/commissioner/NetworkCredential.java
diff --git a/...PTool/app/src/main/java/com/google/chip/chiptool/commissioner/thread/BorderAgentInfo.java b/...PTool/app/src/main/java/com/google/chip/chiptool/commissioner/thread/BorderAgentInfo.java
diff --git a/...ool/app/src/main/java/com/google/chip/chiptool/commissioner/thread/CommissionerUtils.java b/...ool/app/src/main/java/com/google/chip/chiptool/commissioner/thread/CommissionerUtils.java
diff --git a/...c/main/java/com/google/chip/chiptool/commissioner/thread/ThreadCommissionerException.java b/...c/main/java/com/google/chip/chiptool/commissioner/thread/ThreadCommissionerException.java