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.

Sign up for GitHub

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

connect: more MAC adresses (fixes #1826) #1827

Closed
wants to merge 2 commits into from
Closed

connect: more MAC adresses (fixes #1826) #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6063d6
Update RPIDialogFragment.kt
dogi Jan 24, 2024
ad3f07a
Update android-build.yml
dogi Jan 24, 2024
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
41 changes: 26 additions & 15 deletions .github/workflows/android-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
name: Android Check CI
name: remote build test

on:
push:
branches:
- '*'
- '!master'

#on:
# workflow_dispatch:
# inputs:

jobs:
build:
runs-on: ubuntu-latest

env:
ANDROID_NDK_VERSION: "21.3.6528147"
BUILD_TOOLS_VERSION: "30.0.2"

steps:
- uses: actions/checkout@v1
- name: set up JDK 1.8
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- name: setup JDK 17
uses: actions/setup-java@v4
with:
java-version: 1.8
- name: Install NDK
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT}
- name: Make gradlew executable
run: chmod +x ./gradlew
- name: Build with Gradle
run: ./gradlew assembleDebug
distribution: 'zulu'
java-version: '17'
cache: 'gradle'
- name: install NDK
run: |
set -x
echo "ANDROID_HOME is set to: ${ANDROID_HOME}"
echo "ANDROID_SDK_ROOT is set to: ${ANDROID_SDK_ROOT}"
echo "ANDROID_NDK_VERSION is set to: ${ANDROID_NDK_VERSION}"
echo "y" | sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${ANDROID_NDK_VERSION}" --sdk_root=${ANDROID_SDK_ROOT} 2>&1
if [ $? -ne 0 ]; then
echo "SDK Manager command failed"
exit 1
fi
set +x
chmod +x ./gradlew
- name: build debug as test
run: ./gradlew assembleDebug
12 changes: 6 additions & 6 deletions app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/RPIDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,12 @@ class RPIDialogFragment : BaseDialogFragment(), DeviceDeleteListener {
}

fun checkPiAddress(deviceHardwareAddress: String): Boolean {
val piAddress: Set<String> = HashSet(listOf("B8:27:EB", "DC:A6:32", "E4:5F:01", "28:CD:C1",
"B8-27-EB", "DC-A6-32", "E4-5F-01", "28-CD-C1",
"B827.EB", "DCA6.32", "E45F.01", "28CD.C1",
"b8:27:eb", "dc:a6:32", "e4:5f:01", "28:cd:c1",
"b8-27-eb", "dc-a6-32", "e4-5f-01", "28-cd-c1",
"b827.eb", "dca6.32", "e45f.01", "28cd.c1"))
val piAddress: Set<String> = HashSet(listOf("B8:27:EB", "D8:3A:DD", "DC:A6:32", "E4:5F:01", "28:CD:C1",
"B8-27-EB", "D8-3A-DD", "DC-A6-32", "E4-5F-01", "28-CD-C1",
"B827.EB", "D83A.DD", "DCA6.32", "E45F.01", "28CD.C1",
"b8:27:eb", "d8:3a:dd", "dc:a6:32", "e4:5f:01", "28:cd:c1",
"b8-27-eb", "d8-3a-dd", "dc-a6-32", "e4-5f-01", "28-cd-c1",
"b827.eb", "d83a.dd", "dca6.32", "e45f.01", "28cd.c1"))
for (item in piAddress) {
if (deviceHardwareAddress.contains(item)) return true
}
Expand Down
Loading