Skip to content

Commit beed7fd

Browse files
shahpiyushvshahpiyushv
committed
Merge branch 'feature/Wifi_scan_list_and_uuid_changes' into 'master'
See merge request idf/esp-idf-provisioning-android!13
2 parents c2960c8 + 42fc41b commit beed7fd

File tree

100 files changed

+3844
-1724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+3844
-1724
lines changed

‎.gitignore

+30-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
.DS_Store
2-
31
# Built application files
42
*.apk
53
*.ap_
@@ -65,3 +63,33 @@ fastlane/Preview.html
6563
fastlane/screenshots
6664
fastlane/test_output
6765
fastlane/readme.md
66+
67+
app/src/main/assets/api_key.txt
68+
69+
# Built application files
70+
/*/build/
71+
72+
# Crashlytics configuations
73+
com_crashlytics_export_strings.xml
74+
75+
# Local configuration file (sdk path, etc)
76+
local.properties
77+
78+
# Gradle generated files
79+
.gradle/
80+
81+
# Signing files
82+
.signing/
83+
84+
# User-specific configurations
85+
.idea/*
86+
*.iml
87+
88+
# OS-specific files
89+
.DS_Storegit add
90+
.D
91+
._*
92+
.Spotlight-V100
93+
.Trashes
94+
ehthumbs.db
95+
Thumbs.db

‎.idea/codeStyles/Project.xml

-29
This file was deleted.

‎.idea/misc.xml

-33
This file was deleted.

‎.idea/modules.xml

-9
This file was deleted.

‎.idea/vcs.xml

-6
This file was deleted.

‎app/build.gradle

+33-33
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,56 @@ apply plugin: 'com.android.application'
22
apply plugin: 'com.google.protobuf'
33

44
android {
5-
compileSdkVersion 27
5+
6+
compileSdkVersion 28
7+
68
defaultConfig {
7-
applicationId "com.espressif.provision"
89
minSdkVersion 21
9-
targetSdkVersion 27
10-
versionCode 1
11-
versionName "1.0"
10+
targetSdkVersion 28
11+
versionCode 5
12+
versionName "1.2"
1213
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1314
}
15+
16+
flavorDimensions "transport", "security"
17+
18+
productFlavors {
19+
20+
wifi {
21+
dimension "transport"
22+
applicationId "com.espressif.provsoftap"
23+
}
24+
ble {
25+
dimension "transport"
26+
applicationId "com.espressif.provble"
27+
}
28+
sec0 {
29+
dimension "security"
30+
}
31+
sec1 {
32+
dimension "security"
33+
}
34+
}
35+
1436
buildTypes {
1537
release {
1638
minifyEnabled false
39+
debuggable false
1740
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1841
resValue "string", "proof_of_possesion", "abcd1234"
1942
resValue "string", "wifi_base_url", "192.168.4.1:80"
2043
resValue "string", "wifi_network_name_prefix", "PROV_"
21-
resValue "string", "ble_service_uuid", "0000ffff-0000-1000-8000-00805f9b34fb"
22-
resValue "string", "ble_session_uuid", "0000ff51-0000-1000-8000-00805f9b34fb"
23-
resValue "string", "ble_config_uuid", "0000ff52-0000-1000-8000-00805f9b34fb"
2444
resValue "string", "ble_device_name_prefix", "PROV_"
45+
buildConfigField "boolean", "IS_ALLOWED_FILTERING_BY_PREFIX", "true"
2546
}
2647

2748
debug {
2849
debuggable true
2950
resValue "string", "proof_of_possesion", "abcd1234"
3051
resValue "string", "wifi_base_url", "192.168.4.1:80"
3152
resValue "string", "wifi_network_name_prefix", "PROV_"
32-
resValue "string", "ble_service_uuid", "0000ffff-0000-1000-8000-00805f9b34fb"
33-
resValue "string", "ble_session_uuid", "0000ff51-0000-1000-8000-00805f9b34fb"
34-
resValue "string", "ble_config_uuid", "0000ff52-0000-1000-8000-00805f9b34fb"
3553
resValue "string", "ble_device_name_prefix", "PROV_"
36-
}
37-
}
38-
39-
flavorDimensions "transport", "security"
40-
productFlavors {
41-
wifi {
42-
dimension "transport"
43-
}
44-
45-
ble {
46-
dimension "transport"
47-
}
48-
49-
sec0 {
50-
dimension "security"
51-
}
52-
53-
sec1 {
54-
dimension "security"
54+
buildConfigField "boolean", "IS_ALLOWED_FILTERING_BY_PREFIX", "true"
5555
}
5656
}
5757
}
@@ -79,12 +79,12 @@ protobuf {
7979

8080
dependencies {
8181
implementation fileTree(include: ['*.jar'], dir: 'libs')
82-
implementation 'com.android.support:appcompat-v7:27.1.1'
82+
implementation 'com.android.support:appcompat-v7:28.0.0'
8383
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
84-
implementation 'com.android.support:design:27.1.1'
84+
implementation 'com.android.support:design:28.0.0'
8585
testImplementation 'junit:junit:4.12'
8686
androidTestImplementation 'com.android.support.test:runner:1.0.2'
8787
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
8888
implementation 'com.google.protobuf:protobuf-lite:3.0.1'
89-
compile 'com.google.crypto.tink:tink-android:1.1.0'
89+
implementation 'com.google.crypto.tink:tink-android:1.1.0'
9090
}

‎app/src/ble/res/drawable/ic_launcher_background.xml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="1157.128"
5+
android:viewportHeight="1157.128">
6+
<group android:translateX="191.88576"
7+
android:translateY="227.53575">
8+
<path
9+
android:pathData="M233,462.3c0,19.2 -15.6,34.8 -34.8,34.8c-19.2,0 -34.8,-15.6 -34.8,-34.8c0,-19.2 15.6,-34.8 34.8,-34.8c0,0 0,0 0,0C217.4,427.6 233,443.1 233,462.3C233,462.3 233,462.3 233,462.3"
10+
android:fillColor="#D9382E"/>
11+
<path
12+
android:pathData="M536.8,426.1C514.5,268 389.1,142.6 230.9,120.3c-18.4,9.8 -35.4,22 -50.5,36.4v33.6c157.8,0 286.2,128.4 286.2,286.2h33.7C514.7,461.5 527,444.5 536.8,426.1"
13+
android:fillColor="#D9382E"/>
14+
<path
15+
android:pathData="M562.9,320.5c0,-125 -101.3,-226.4 -226.4,-226.4c-7.8,0 -15.6,0.5 -23.3,1.3l-5.2,14.9c111.5,39.2 199.2,126.8 238.5,238.4l15.1,-5.3C562.4,335.8 562.9,328.2 562.9,320.5"
16+
android:fillColor="#D9382E"/>
17+
<path
18+
android:pathData="M339.1,589.4C190.5,589.3 70,468.9 70,320.2c0,-71.4 28.3,-139.8 78.8,-190.2l14.4,14.4c-97.1,97.1 -97.1,254.7 0,351.8s254.7,97.1 351.8,0l14.4,14.4C479,561.2 410.5,589.6 339.1,589.4"
19+
android:fillColor="#D9382E"/>
20+
<path
21+
android:pathData="M336.2,492.1c8.5,-86 -54.3,-162.6 -140.2,-171.2c-7.7,-0.8 -13.3,-7.6 -12.6,-15.3c0.6,-7.6 7.2,-13.3 14.8,-12.7c0.2,0 0.4,0 0.6,0.1c101,9.6 175,99.3 165.4,200.3c-1.1,11.3 -3.2,22.5 -6.3,33.4l40.8,11.5c12.1,-3.4 24,-7.9 35.4,-13.3c3,-15.9 4.5,-32.1 4.5,-48.3c0,-129.5 -95.7,-237 -220.1,-255.4c-14.9,-2.1 -30.1,-2.3 -41.2,0.5c-47.2,12 -75.7,59.9 -63.8,107.1c7.5,29.5 29.7,53.1 58.7,62.3c6.7,2.1 17,3 22.2,4h0.2c44.9,7.7 75.1,50.3 67.5,95.3c-1.9,11 -5.9,21.4 -12,30.8l28.3,18.1c13.8,3.7 27.9,6 42.2,7.1C329,529.3 334.3,511 336.2,492.1"
22+
android:fillColor="#D9382E"/>
23+
<path
24+
android:pathData="M556,427.8l87,54.8l-55.4,40.5l-0.6,-72.7"
25+
android:strokeLineJoin="round"
26+
android:strokeWidth="9"
27+
android:fillColor="#00000000"
28+
android:strokeColor="#062F46"
29+
android:strokeLineCap="round"/>
30+
<path
31+
android:pathData="M555.4,470.1l88.8,-56l-55.4,-40.5l-0.6,72.7"
32+
android:strokeLineJoin="round"
33+
android:strokeWidth="9"
34+
android:fillColor="#00000000"
35+
android:strokeColor="#E04329"
36+
android:strokeLineCap="round"/>
37+
<path
38+
android:pathData="M659.1,385.1c0,6.3 5.1,11.5 11.5,11.5c6.3,0 11.5,-5.1 11.5,-11.5c0,-6.3 -5.1,-11.5 -11.5,-11.5c0,0 0,0 0,0C664.3,373.6 659.1,378.7 659.1,385.1C659.1,385.1 659.1,385.1 659.1,385.1z"
39+
android:strokeLineJoin="round"
40+
android:strokeWidth="9"
41+
android:fillColor="#00000000"
42+
android:strokeColor="#062F46"
43+
android:strokeLineCap="round"/>
44+
</group>
45+
</vector>

‎app/src/ble/res/drawable/ic_launcher_foreground.xml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="1157.128"
5+
android:viewportHeight="1157.128">
6+
<group android:translateX="191.88576"
7+
android:translateY="227.53575">
8+
<path
9+
android:pathData="M233,462.3c0,19.2 -15.6,34.8 -34.8,34.8c-19.2,0 -34.8,-15.6 -34.8,-34.8c0,-19.2 15.6,-34.8 34.8,-34.8c0,0 0,0 0,0C217.4,427.6 233,443.1 233,462.3C233,462.3 233,462.3 233,462.3"
10+
android:fillColor="#D9382E"/>
11+
<path
12+
android:pathData="M536.8,426.1C514.5,268 389.1,142.6 230.9,120.3c-18.4,9.8 -35.4,22 -50.5,36.4v33.6c157.8,0 286.2,128.4 286.2,286.2h33.7C514.7,461.5 527,444.5 536.8,426.1"
13+
android:fillColor="#D9382E"/>
14+
<path
15+
android:pathData="M562.9,320.5c0,-125 -101.3,-226.4 -226.4,-226.4c-7.8,0 -15.6,0.5 -23.3,1.3l-5.2,14.9c111.5,39.2 199.2,126.8 238.5,238.4l15.1,-5.3C562.4,335.8 562.9,328.2 562.9,320.5"
16+
android:fillColor="#D9382E"/>
17+
<path
18+
android:pathData="M339.1,589.4C190.5,589.3 70,468.9 70,320.2c0,-71.4 28.3,-139.8 78.8,-190.2l14.4,14.4c-97.1,97.1 -97.1,254.7 0,351.8s254.7,97.1 351.8,0l14.4,14.4C479,561.2 410.5,589.6 339.1,589.4"
19+
android:fillColor="#D9382E"/>
20+
<path
21+
android:pathData="M336.2,492.1c8.5,-86 -54.3,-162.6 -140.2,-171.2c-7.7,-0.8 -13.3,-7.6 -12.6,-15.3c0.6,-7.6 7.2,-13.3 14.8,-12.7c0.2,0 0.4,0 0.6,0.1c101,9.6 175,99.3 165.4,200.3c-1.1,11.3 -3.2,22.5 -6.3,33.4l40.8,11.5c12.1,-3.4 24,-7.9 35.4,-13.3c3,-15.9 4.5,-32.1 4.5,-48.3c0,-129.5 -95.7,-237 -220.1,-255.4c-14.9,-2.1 -30.1,-2.3 -41.2,0.5c-47.2,12 -75.7,59.9 -63.8,107.1c7.5,29.5 29.7,53.1 58.7,62.3c6.7,2.1 17,3 22.2,4h0.2c44.9,7.7 75.1,50.3 67.5,95.3c-1.9,11 -5.9,21.4 -12,30.8l28.3,18.1c13.8,3.7 27.9,6 42.2,7.1C329,529.3 334.3,511 336.2,492.1"
22+
android:fillColor="#D9382E"/>
23+
<path
24+
android:pathData="M556,427.8l87,54.8l-55.4,40.5l-0.6,-72.7"
25+
android:strokeLineJoin="round"
26+
android:strokeWidth="9"
27+
android:fillColor="#00000000"
28+
android:strokeColor="#062F46"
29+
android:strokeLineCap="round"/>
30+
<path
31+
android:pathData="M555.4,470.1l88.8,-56l-55.4,-40.5l-0.6,72.7"
32+
android:strokeLineJoin="round"
33+
android:strokeWidth="9"
34+
android:fillColor="#00000000"
35+
android:strokeColor="#E04329"
36+
android:strokeLineCap="round"/>
37+
<path
38+
android:pathData="M659.1,385.1c0,6.3 5.1,11.5 11.5,11.5c6.3,0 11.5,-5.1 11.5,-11.5c0,-6.3 -5.1,-11.5 -11.5,-11.5c0,0 0,0 0,0C664.3,373.6 659.1,378.7 659.1,385.1C659.1,385.1 659.1,385.1 659.1,385.1z"
39+
android:strokeLineJoin="round"
40+
android:strokeWidth="9"
41+
android:fillColor="#00000000"
42+
android:strokeColor="#062F46"
43+
android:strokeLineCap="round"/>
44+
</group>
45+
</vector>

‎app/src/ble/res/mipmap-anydpi-v26/ic_launcher.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_launcher_background" />
4+
<foreground android:drawable="@drawable/ic_launcher_foreground" />
5+
</adaptive-icon>

‎app/src/ble/res/mipmap-anydpi-v26/ic_launcher_round.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_launcher_background"/>
4+
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5+
</adaptive-icon>

‎app/src/ble/res/mipmap-hdpi/ic_launcher.png

5.28 KB
Loading

‎app/src/ble/res/mipmap-hdpi/ic_launcher_foreground.png

4.68 KB
Loading

‎app/src/ble/res/mipmap-hdpi/ic_launcher_round.png

5.57 KB
Loading

‎app/src/ble/res/mipmap-mdpi/ic_launcher.png

2.82 KB
Loading

‎app/src/ble/res/mipmap-mdpi/ic_launcher_foreground.png

2.97 KB
Loading

‎app/src/ble/res/mipmap-mdpi/ic_launcher_round.png

3.42 KB
Loading

‎app/src/ble/res/mipmap-xhdpi/ic_launcher.png

6.54 KB
Loading

‎app/src/ble/res/mipmap-xhdpi/ic_launcher_foreground.png

6.57 KB
Loading

‎app/src/ble/res/mipmap-xhdpi/ic_launcher_round.png

7.85 KB
Loading

‎app/src/ble/res/mipmap-xxhdpi/ic_launcher.png

12.2 KB
Loading

‎app/src/ble/res/mipmap-xxhdpi/ic_launcher_foreground.png

10.8 KB
Loading

‎app/src/ble/res/mipmap-xxhdpi/ic_launcher_round.png

12.4 KB
Loading

‎app/src/ble/res/mipmap-xxxhdpi/ic_launcher.png

15.6 KB
Loading

‎app/src/ble/res/mipmap-xxxhdpi/ic_launcher_foreground.png

15.8 KB
Loading

‎app/src/ble/res/mipmap-xxxhdpi/ic_launcher_round.png

17.8 KB
Loading

‎app/src/ble/res/values/ic_launcher_background.xml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="ic_launcher_background">#FFFFFF</color>
4+
</resources>

‎app/src/ble/res/values/strings.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<resources>
2+
3+
<string name="app_name">ESP BLE Prov</string>
4+
5+
</resources>

0 commit comments

Comments
 (0)