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

feat(networks) Add selection of wifi network using autocomplete #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
6 changes: 5 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ android {
buildConfigField "boolean", "IS_ALLOWED_FILTERING_BY_PREFIX", "true"
}
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}
}

protobuf {
Expand All @@ -80,7 +84,7 @@ protobuf {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:design:28.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;

/**
* Instrumented test, which will execute on an Android device.
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.VIBRATE" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,9 @@ private void processStep0Response(byte[] hexData) throws RuntimeException {
this.cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec);

this.clientVerify = this.encrypt(devicePublicKey);
} catch (InvalidProtocolBufferException e) {
Log.e(TAG, e.getMessage());
} catch (InvalidKeyException e) {
} catch (InvalidProtocolBufferException | InvalidKeyException | NoSuchAlgorithmException e) {
Log.e(TAG, e.getMessage());
} catch (NoSuchAlgorithmException e) {
Log.e(TAG, e.getMessage());
} catch (NoSuchPaddingException e) {
e.printStackTrace();
} catch (InvalidAlgorithmParameterException e) {
} catch (NoSuchPaddingException | InvalidAlgorithmParameterException e) {
e.printStackTrace();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
// limitations under the License.
package com.espressif.ui.activities;

import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.location.LocationManager;
import android.os.Build;
import android.os.Bundle;
Expand All @@ -26,7 +28,6 @@
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.TextUtils;
import android.util.Log;
import android.view.HapticFeedbackConstants;
import android.view.Menu;
Expand Down Expand Up @@ -123,6 +124,12 @@ protected void onResume() {
if (BuildConfig.FLAVOR_transport.equals("ble") && BLEProvisionLanding.isBleWorkDone) {
BLEProvisionLanding.bleTransport.disconnect();
}

if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, 87);
}
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@
// limitations under the License.
package com.espressif.ui.activities;

import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.Color;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.Vibrator;
import android.support.v7.app.AppCompatActivity;
Expand All @@ -25,6 +30,7 @@
import android.util.Log;
import android.view.HapticFeedbackConstants;
import android.view.View;
import android.widget.AutoCompleteTextView;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ProgressBar;
Expand All @@ -40,6 +46,10 @@
import com.espressif.provision.session.Session;
import com.espressif.provision.transport.SoftAPTransport;
import com.espressif.provision.transport.Transport;
import com.espressif.ui.adapters.AutoSuggestAdapter;

import java.util.ArrayList;
import java.util.List;

import espressif.Constants;
import espressif.WifiConstants;
Expand All @@ -49,7 +59,7 @@ public class ProvisionActivity extends AppCompatActivity {
private static final String TAG = "Espressif::" + ProvisionActivity.class.getSimpleName();

private TextView ssid;
private EditText ssidInput;
private AutoCompleteTextView ssidInput;
private EditText passwordInput;
private Button btnProvision;
private ProgressBar progressBar;
Expand All @@ -58,6 +68,11 @@ public class ProvisionActivity extends AppCompatActivity {
private String ssidValue, passphraseValue = "";
private String pop, baseUrl, transportVersion, securityVersion;

private AutoSuggestAdapter autoSuggestAdapter;

private WifiManager wifiManager;
private WifiReceiver wifiReceiver;

@Override
protected void onCreate(Bundle savedInstanceState) {

Expand All @@ -67,6 +82,14 @@ protected void onCreate(Bundle savedInstanceState) {
toolbar.setTitle(R.string.title_activity_provision);
setSupportActionBar(toolbar);

// TODO: Add check for wifi enabled

wifiReceiver = new WifiReceiver();
wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
registerReceiver(wifiReceiver,
new IntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION));
wifiManager.startScan();

Intent intent = getIntent();
final String wifiSSID = intent.getStringExtra(Provision.PROVISIONING_WIFI_SSID);
wifiSecurityType = intent.getIntExtra(AppConstants.KEY_WIFI_SECURITY_TYPE, AppConstants.WIFI_OPEN);
Expand All @@ -76,6 +99,10 @@ protected void onCreate(Bundle savedInstanceState) {
securityVersion = intent.getStringExtra(Provision.CONFIG_SECURITY_KEY);

ssid = findViewById(R.id.ssid_text);

autoSuggestAdapter = new AutoSuggestAdapter(this,
android.R.layout.simple_dropdown_item_1line);

ssidInput = findViewById(R.id.ssid_input);
passwordInput = findViewById(R.id.password_input);
btnProvision = findViewById(R.id.btn_provision);
Expand Down Expand Up @@ -111,6 +138,9 @@ protected void onCreate(Bundle savedInstanceState) {
btnProvision.setAlpha(0.5f);
btnProvision.setTextColor(Color.WHITE);

ssidInput.setThreshold(2);
ssidInput.setAdapter(autoSuggestAdapter);

ssidInput.addTextChangedListener(new TextWatcher() {

@Override
Expand Down Expand Up @@ -390,4 +420,30 @@ private void goToSuccessPage(String statusText) {
goToSuccessPage.putExtras(getIntent());
startActivity(goToSuccessPage);
}

public class WifiReceiver extends BroadcastReceiver {

@Override
public void onReceive(Context context, Intent intent) {

Log.d(TAG,"wifi receiver");


if(intent.getAction().equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION))
{
List<ScanResult> scanResults = wifiManager.getScanResults();

ArrayList<String> ssidList = new ArrayList<>();

for (ScanResult scanResult : scanResults) {
if (scanResult.frequency > 2400 && scanResult.frequency < 2500){
ssidList.add(scanResult.SSID);
}
}

autoSuggestAdapter.setListData(ssidList);
autoSuggestAdapter.notifyDataSetChanged();
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package com.espressif.ui.adapters;

import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.widget.ArrayAdapter;
import android.widget.Filter;
import android.widget.Filterable;

import java.util.ArrayList;
import java.util.List;


public class AutoSuggestAdapter extends ArrayAdapter<String> implements Filterable {
private List<String> listData;

public AutoSuggestAdapter(@NonNull Context context, int resource) {
super(context, resource);
listData = new ArrayList<>();
}

public void setListData(List<String> list) {
listData.clear();
listData.addAll(list);
}

@Override
public int getCount() {
return listData.size();
}

@Nullable
@Override
public String getItem(int position) {
return listData.get(position);
}

@NonNull
@Override
public Filter getFilter() {
Filter dataFilter = new Filter() {
@Override
protected FilterResults performFiltering(CharSequence constraint) {
FilterResults filterResults = new FilterResults();
if (constraint != null) {
filterResults.values = listData;
filterResults.count = listData.size();
}
return filterResults;
}
@Override
protected void publishResults(CharSequence constraint, FilterResults results) {
if (results != null && (results.count > 0)) {
notifyDataSetChanged();
} else {
notifyDataSetInvalidated();
}
}
};
return dataFilter;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import android.widget.ImageView;
import android.widget.TextView;

import com.espressif.provision.R;
import com.espressif.AppConstants;
import com.espressif.provision.R;
import com.espressif.ui.models.WiFiAccessPoint;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/content_provision.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
android:layout_marginEnd="20dp"
android:layout_marginBottom="30dp">

<EditText
<AutoCompleteTextView
android:id="@+id/ssid_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import org.junit.Test;

import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;

/**
* Example local unit test, which will execute on the development machine (host).
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6'
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jun 14 09:48:06 CST 2019
#Tue Jan 07 22:24:46 AEDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip