下層修改要復原上層設定--->以下層為主 & 找不到報告的Error Check

app/src/main/java/org/prlab/idic/privacypolicy/ReportActivity.java

@@ -11,6 +11,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 import com.google.gson.Gson;
 import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
@@ -184,9 +185,14 @@ public class ReportActivity extends Activity
 
     @Override
     public void onLoadFinished(Loader<PrivacyPolicyReport> loader, PrivacyPolicyReport report) {
-        mPrivacyPolicyReport = report;
-        mLayerIDs.add(report.getRoot().getUUID());
-        setView();
+        if (null != report) {
+            mPrivacyPolicyReport = report;
+            mLayerIDs.add(report.getRoot().getUUID());
+            setView();
+        } else {
+            Toast.makeText(this, R.string.message_report_not_found, Toast.LENGTH_LONG).show();
+            finish();
+        }
     }
 
     @Override

app/src/main/java/org/prlab/idic/privacypolicy/storage/PrivacyPolicyStorageImpl.java

@@ -7,10 +7,8 @@ import android.net.Uri;
 import android.util.Log;
 import org.prlab.idic.privacypolicy.tool.BaseUtils;
 
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Created by IDIC on 2017/2/15.
@@ -80,6 +78,10 @@ public class PrivacyPolicyStorageImpl implements StorageInterface<Integer, Strin
         } else {
             Log.i(TAG, "Put " + String.valueOf(selection) + " to [" + layerUUIDs + "] success.");
         }
+        List<String> subUUIDs = getRelatedUUIDs(false, layerUUIDs);
+        for (String subUUID : subUUIDs) {
+            remove(subUUID);
+        }
     }
 
     @Override

app/src/main/res/values/strings.xml

@@ -13,6 +13,7 @@
     <string name="message_device_position_picture">Device Position Picture</string>
 
     <string name="message_device_information">Device Information</string>
+    <string name="message_report_not_found">Report Not Found</string>
     <string name="message_press_scan_first">Start scanning first.</string>
     <string name="message_scan_start">There are BLE sensors around you as follow.</string>
     <string name="message_scan_stop">Stop scanning.</string>