Skip to content

B
BLEPrivacyPolicyNegotiator
Commit 944992d0 authored by idic's avatar idic
Browse files
Options

CONTENT PROVIDER BUG FIX

parent 5d116ce2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 192 deletions
app/build.gradle
View file @ 944992d0
......@@ -24,8 +24,8 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.android.support:recyclerview-v7:25.1.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:recyclerview-v7:25.3.1'
compile 'com.squareup.okhttp3:okhttp:3.6.0'
compile 'com.google.code.gson:gson:2.8.0'
......
app/src/main/java/org/prlab/idic/privacypolicy/MainActivity.java
View file @ 944992d0
......@@ -49,6 +49,7 @@ public class MainActivity extends AppCompatActivity {
private BluetoothLeScanner mBluetoothLeScanner;
private ScanSettings.Builder mScanSettingsBuilder = new ScanSettings.Builder()
.setScanMode(ScanSettings.SCAN_MODE_BALANCED);
private List<ScanFilter> mScanFilters = new LinkedList<>();
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -65,6 +66,7 @@ public class MainActivity extends AppCompatActivity {
mBluetoothAdapter = mBluetoothManager.getAdapter();
if (mBluetoothAdapter != null) {
mBluetoothLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
mScanFilters.add(new ScanFilter.Builder().setDeviceAddress("E3:3F:A4:CB:1A:F2").build());
}
}
}
......@@ -241,7 +243,7 @@ public class MainActivity extends AppCompatActivity {
private boolean startScan() {
if (mBluetoothLeScanner != null) {
mBluetoothLeScanner.startScan(new LinkedList<ScanFilter>(), mScanSettingsBuilder.build(), mLeScanCallback);
mBluetoothLeScanner.startScan(mScanFilters, mScanSettingsBuilder.build(), mLeScanCallback);
isScanning = true;
return true;
}
......
app/src/main/java/org/prlab/idic/privacypolicy/storage/PrivacyPolicyStorageImpl.java
View file @ 944992d0
......@@ -71,9 +71,8 @@ public class PrivacyPolicyStorageImpl implements StorageInterface<Integer, Strin
PrivacyPolicyContract.PolicyEntry.CONTENT_URI,
updateContentValues,
PrivacyPolicyContract.PolicyEntry.COLUMN_MAC + " = ? " + " AND " +
PrivacyPolicyContract.PolicyEntry.COLUMN_POLICY + " = ? " + " AND " +
PrivacyPolicyContract.PolicyEntry.COLUMN_PREFERENCE + " = ? ",
new String[]{mTargetDeviceMAC, String.valueOf(id), choice}
PrivacyPolicyContract.PolicyEntry.COLUMN_POLICY + " = ? ",
new String[]{mTargetDeviceMAC, String.valueOf(id)}
);
Log.i(TAG, "Update " + String.valueOf(choice) + " to [" + id + "] " + (count == 1 ? "success" : "failure") + ".");
} else {
......
app/src/main/res/layout/actiivty_dialog_device_info.xml
View file @ 944992d0
......@@ -7,19 +7,31 @@
android:layout_margin="@dimen/activity_horizontal_margin"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
android:id="@+id/layout_device_info"
<ScrollView
android:id="@+id/scroll_device_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
tools:listitem="@layout/recycler_view_item_horizontally" />
android:layout_height="wrap_content">
<android.support.v7.widget.RecyclerView
android:id="@+id/layout_device_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
tools:listitem="@layout/recycler_view_item_horizontally" />
<android.support.v7.widget.RecyclerView
android:id="@+id/layout_device_icon"
android:layout_below="@+id/layout_device_info"
</ScrollView>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
tools:listitem="@layout/recycler_view_icon" />
android:layout_below="@+id/scroll_device_info">
<android.support.v7.widget.RecyclerView
android:id="@+id/layout_device_icon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
tools:listitem="@layout/recycler_view_icon" />
</ScrollView>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
View file @ 944992d0
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/activity_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="org.prlab.idic.privacypolicy.MainActivity">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="org.prlab.idic.privacypolicy.MainActivity">
<TextView
tools:text="123456"
android:gravity="center"
android:textColor="@color/colorObvious"
android:background="@color/colorImplicit"
android:id="@+id/text_main_message_bar"
android:layout_alignParentTop="true"
android:textSize="@dimen/font_bigger_size"
android:layout_width="match_parent"
android:layout_height="@dimen/small_item_size"/>
android:id="@+id/text_main_message_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/small_item_size"
android:layout_alignParentTop="true"
android:background="@color/colorImplicit"
android:gravity="center"
android:textColor="@color/colorObvious"
android:textSize="@dimen/font_bigger_size"
tools:text="123456" />
<android.support.v7.widget.RecyclerView
android:layout_marginTop="@dimen/small_size"
tools:listitem="@layout/recycler_view_scan_item"
android:layout_below="@id/text_main_message_bar"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/recycler_view_main_result"/>
android:id="@+id/recycler_view_main_result"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/text_main_message_bar"
android:layout_marginTop="@dimen/small_size"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
tools:listitem="@layout/recycler_view_scan_item" />
</RelativeLayout>
app/src/main/res/layout/recycler_view_policy.xml
View file @ 944992d0
......@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:focusable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
......@@ -22,13 +23,13 @@
android:gravity="center" />
<ImageView
android:src="@drawable/ic_arrow_drop_up_black_24dp"
android:id="@+id/image_view_policy_scaled"
android:layout_width="@dimen/small_item_size"
android:layout_height="@dimen/small_item_size"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_below="@id/switch_policy_accept"/>
android:layout_alignParentEnd="true"
android:layout_below="@id/switch_policy_accept"
android:src="@drawable/ic_arrow_drop_up_black_24dp" />
<TextView
android:id="@+id/text_policy_title"
......
app/src/main/res/layout/recycler_view_scan_item.xml
View file @ 944992d0
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tool="http://schemas.android.com/tools">
xmlns:tool="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:id="@+id/linear_layout_scan_info"
android:layout_width="wrap_content"
android:layout_height="@dimen/item_size" android:layout_marginLeft="@dimen/small_size"
android:layout_marginRight="@dimen/small_size" android:layout_centerVertical="true"
android:layout_centerHorizontal="true">
android:id="@+id/linear_layout_scan_info"
android:layout_width="wrap_content"
android:layout_height="@dimen/item_size"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/small_size"
android:layout_marginRight="@dimen/small_size">
<ImageView
android:id="@+id/image_scan_allowed"
android:scaleType="centerInside"
tool:src="@drawable/rounded_yes"
android:layout_width="@dimen/item_size"
android:layout_height="@dimen/item_size"
android:contentDescription="@string/message_privacy_policy"/>
android:id="@+id/image_scan_allowed"
android:layout_width="@dimen/item_size"
android:layout_height="@dimen/item_size"
android:contentDescription="@string/message_privacy_policy"
android:focusable="true"
android:scaleType="centerInside"
tool:src="@drawable/rounded_yes" />
<Button
android:id="@+id/button_scan_connect"
android:text="@string/action_connect"
android:layout_marginStart="@dimen/median_size"
android:textSize="@dimen/font_normal_size"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:id="@+id/button_scan_connect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/median_size"
android:text="@string/action_connect"
android:textSize="@dimen/font_normal_size" />
<TextView
android:gravity="center_vertical"
android:layout_toEndOf="@id/image_scan_allowed"
android:layout_toStartOf="@id/button_scan_connect"
android:id="@+id/text_scan_device_name"
tool:text="nRF Temperature Monitor"
android:textSize="@dimen/font_normal_size"
android:layout_width="wrap_content"
android:layout_height="15sp"/>
android:id="@+id/text_scan_device_name"
android:layout_width="wrap_content"
android:layout_height="15sp"
android:layout_toEndOf="@id/image_scan_allowed"
android:layout_toStartOf="@id/button_scan_connect"
android:gravity="center_vertical"
android:textSize="@dimen/font_normal_size"
tool:text="nRF Temperature Monitor" />
<TextView
android:gravity="center_vertical"
android:layout_toEndOf="@id/image_scan_allowed"
android:layout_toStartOf="@id/button_scan_connect"
android:layout_below="@id/text_scan_device_name"
android:id="@+id/text_scan_device_mac"
android:textSize="@dimen/font_normal_size"
tool:text="AA:AA:AA:AA:AA:AA"
android:layout_width="wrap_content"
android:layout_height="15sp"/>
android:id="@+id/text_scan_device_mac"
android:layout_width="wrap_content"
android:layout_height="15sp"
android:layout_below="@id/text_scan_device_name"
android:layout_toEndOf="@id/image_scan_allowed"
android:layout_toStartOf="@id/button_scan_connect"
android:gravity="center_vertical"
android:textSize="@dimen/font_normal_size"
tool:text="AA:AA:AA:AA:AA:AA" />
<TextView
android:gravity="center_vertical"
android:layout_toEndOf="@id/image_scan_allowed"
android:layout_below="@id/text_scan_device_mac"
android:id="@+id/text_scan_is_bonded"
android:textSize="@dimen/font_normal_size"
tool:text="@string/bluetooth_bonded"
android:layout_width="wrap_content"
android:layout_height="15sp"/>
android:id="@+id/text_scan_is_bonded"
android:layout_width="wrap_content"
android:layout_height="15sp"
android:layout_below="@id/text_scan_device_mac"
android:layout_toEndOf="@id/image_scan_allowed"
android:gravity="center_vertical"
android:textSize="@dimen/font_normal_size"
tool:text="@string/bluetooth_bonded" />
<TextView
android:gravity="center_vertical|end"
android:layout_toEndOf="@id/text_scan_is_bonded"
android:layout_toStartOf="@id/button_scan_connect"
android:layout_below="@id/text_scan_device_name"
android:id="@+id/text_scan_rssi"
android:textSize="@dimen/font_normal_size"
tool:text="-48 dBm"
android:layout_width="wrap_content"
android:layout_height="15sp"/>
android:id="@+id/text_scan_rssi"
android:layout_width="wrap_content"
android:layout_height="15sp"
android:layout_below="@id/text_scan_device_name"
android:layout_toEndOf="@id/text_scan_is_bonded"
android:layout_toStartOf="@id/button_scan_connect"
android:gravity="center_vertical|end"
android:textSize="@dimen/font_normal_size"
tool:text="-48 dBm" />
</RelativeLayout>
<View
android:layout_below="@id/linear_layout_scan_info"
android:background="@color/colorSeparator"
android:layout_width="match_parent"
android:layout_height="1dp"/>
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/linear_layout_scan_info"
android:background="@color/colorSeparator" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 944992d0
......@@ -37,7 +37,7 @@
<string name="bluetooth_not_bonded">NOT BONDED</string>
<string name="get_policy_url"
translatable="false">http://192.168.0.157:8080/policy.json</string>
translatable="false">http://140.118.110.164:18080/policy.json</string>
<string name="get_policy_id_parameter_key"
translatable="false">id</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment