添加隐私协议

.idea/misc.xml

@@ -23,6 +23,7 @@
         <entry key="app/src/main/res/layout/activity_list_edit.xml" value="0.12208713272543059" />
         <entry key="app/src/main/res/layout/activity_list_title.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.3546195652173913" />
+        <entry key="app/src/main/res/layout/activity_privacy_policy.xml" value="0.38632246376811596" />
         <entry key="app/src/main/res/layout/activity_qr.xml" value="0.19300911854103345" />
         <entry key="app/src/main/res/layout/activity_sourceannouncement.xml" value="0.625" />
         <entry key="app/src/main/res/layout/activity_wifi_list.xml" value="0.2807971014492754" />

app/src/main/AndroidManifest.xml

@@ -223,6 +223,11 @@
             android:exported="true"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleInstance" />
+        <activity
+            android:name=".Activity.PrivacyPolicyActivity"
+            android:exported="true"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleInstance" />
         <activity
             android:name=".Activity.BlackDoorPasswordActivity"
             android:exported="true"

app/src/main/java/com/xplora/xpsettings/Activity/AboutActivity.java

@@ -54,7 +54,7 @@ public class AboutActivity extends BaseActivity {
         String eid = DataManager.getEsimEid();
 
         String[] stringList = getResources().getStringArray(R.array.about_titls_array);
-        String[] valueList = {modelName, cpu, ram, storage, softwareVersion, firmwareVersion, imei, eid, sn, wifi, bt, ""};
+        String[] valueList = {modelName, cpu, ram, storage, softwareVersion, firmwareVersion, imei, eid, sn, wifi, bt, "", ""};
 
         for (int i = 0; i < stringList.length; i++) {
             BaseModel model = new BaseModel();
@@ -83,8 +83,10 @@ public class AboutActivity extends BaseActivity {
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if (position == mDataList.size()-1) {
+                if (position == mDataList.size()-2) {
                     openSourceAnnouncement();
+                } else if (position == mDataList.size()-1) {
+                    openPrivacyPolicy();
                 } else if (position == 4) {
                     mClickCount++;
                     if (mClickCount >= 10) {
@@ -126,43 +128,6 @@ public class AboutActivity extends BaseActivity {
         return Formatter.formatFileSize(context, initial_memory);// Byte转换为KB或者MB，内存大小规格化
     }
 
-//    // 获取设备的内存大小，返回值单位为G
-//    public static int getTotalMemorySize(){
-//        String path = "/proc/meminfo";
-//        String firstLine = null;
-//        FileReader fileReader = null;
-//        BufferedReader bufferedReader = null;
-//        try{
-//            fileReader = new FileReader(path);
-//            bufferedReader = new BufferedReader(fileReader,8192);
-//            firstLine = bufferedReader.readLine().split("\\s+")[1];
-//        } catch (Exception e){
-//            e.printStackTrace();
-//        } finally {
-//            try {
-//                if (bufferedReader != null) {
-//                    bufferedReader.close();
-//                }
-//            } catch (Exception e) {
-//                e.printStackTrace(System.out);
-//            }
-//
-//            try {
-//                if (fileReader != null) {
-//                    fileReader.close();
-//                }
-//            } catch (Exception e) {
-//                e.printStackTrace(System.out);
-//            }
-//        }
-//
-//        if(TextUtils.isEmpty(firstLine)){
-//            return (int)Math.ceil((new Float(Float.valueOf(firstLine) / (1024 * 1024)).doubleValue()));
-//        }
-//
-//        return 0;
-//    }
-
     private void showBlackdoorPassword() {
         Intent intent = new Intent(this, BlackDoorPasswordActivity.class);
         intent.putExtra("from", 0);
@@ -173,4 +138,9 @@ public class AboutActivity extends BaseActivity {
         Intent intent = new Intent(this, SourceAnnouncementActivity.class);
         startActivity(intent);
     }
+
+    private void openPrivacyPolicy() {
+        Intent intent = new Intent(this, PrivacyPolicyActivity.class);
+        startActivity(intent);
+    }
 }

app/src/main/java/com/xplora/xpsettings/Activity/PrivacyPolicyActivity.java

@@ -0,0 +1,39 @@
+package com.xplora.xpsettings.Activity;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.widget.TextView;
+
+import com.xplora.xpsettings.R;
+
+public class PrivacyPolicyActivity extends BaseActivity{
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_privacy_policy);
+        initView();
+    }
+
+    @SuppressLint("SetTextI18n")
+    private void initView() {
+        TextView textView_0 = findViewById(R.id.cpp_text_0);
+        TextView textView_0_content = findViewById(R.id.cpp_text_0_content);
+        textView_0.setText(R.string.children_privacy_policy_0);
+        textView_0_content.setText(R.string.children_privacy_policy_0_content);
+
+        TextView textView_1 = findViewById(R.id.cpp_text_1);
+        TextView textView_1_content = findViewById(R.id.cpp_text_1_content);
+        textView_1.setText(R.string.children_privacy_policy_1);
+        textView_1_content.setText(R.string.children_privacy_policy_1_content);
+
+        TextView textView_1_0 = findViewById(R.id.cpp_text_1_0);
+        TextView textView_1_0_content = findViewById(R.id.cpp_text_1_0_content);
+        textView_1_0.setText(R.string.children_privacy_policy_1_0_content);
+        textView_1_0_content.setText(R.string.children_privacy_policy_1_0_content);
+
+//        Spannable textSpan = new SpannableStringBuilder(text1);
+//        textView.setText(textSpan);
+    }
+}

app/src/main/java/com/xplora/xpsettings/Activity/SourceAnnouncementActivity.java

@@ -2,6 +2,8 @@ package com.xplora.xpsettings.Activity;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
 import android.widget.TextView;
 
 import com.xplora.xpsettings.R;
@@ -23,6 +25,10 @@ public class SourceAnnouncementActivity extends BaseActivity{
         String text1 = getString(R.string.source_announcement_1);
         String text2 = getString(R.string.source_announcement_2);
 
+
+        Spannable textSpan = new SpannableStringBuilder(text1);
+        textView.setText(textSpan);
+
         textView.setText(text1 + "\n" + "\n" + text2);
     }
 }

app/src/main/res/layout/activity_privacy_policy.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
+        tools:ignore="UselessParent"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            >
+            <TextView
+                android:id="@+id/cpp_text_0"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                android:textColor="#FFFFFFFF"
+                />
+
+            <TextView
+                android:id="@+id/cpp_text_0_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="9sp"
+                android:textColor="#FFFFFFFF"
+                />
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="10dp"/>
+
+            <TextView
+                android:id="@+id/cpp_text_1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                android:textColor="#FFFFFFFF"
+                />
+            <TextView
+                android:id="@+id/cpp_text_1_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="9sp"
+                android:textColor="#FFFFFFFF"
+                />
+
+            <TextView
+                android:id="@+id/cpp_text_1_0"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                android:textColor="#FFFFFFFF"
+                />
+            <TextView
+                android:id="@+id/cpp_text_1_0_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="9sp"
+                android:textColor="#FFFFFFFF"
+                />
+            
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>

app/src/main/res/values-b+sr+Latn/arrays.xml

@@ -59,6 +59,7 @@
         <item>Wi-Fi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Obaveštenje o otvorenom kodu</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-da/arrays.xml

@@ -59,6 +59,7 @@
         <item>Wi-Fi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Open Source-meddelelse</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-de/arrays.xml

@@ -59,6 +59,7 @@
         <item>WLAN MAC</item>
         <item>Bluetooth MAC</item>
         <item>Open-Source-Ankündigung</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-es/arrays.xml

@@ -59,6 +59,7 @@
         <item>MAC del WiFi</item>
         <item>MAC del Bluetooth</item>
         <item>Anuncio de código abierto</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-et/arrays.xml

@@ -59,6 +59,7 @@
         <item>Wi-Fi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Avatud lähtekoodi teadaanne</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-fi/arrays.xml

@@ -59,6 +59,7 @@
         <item>Wi-Fi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Avoimen lähdekoodin ilmoitus</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-fr/arrays.xml

@@ -59,6 +59,7 @@
         <item>WiFi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Annonce d\'une source ouverte</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-hu/arrays.xml

@@ -59,6 +59,7 @@
         <item>Wi-Fi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Nyílt forráskódú hirdetmény</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-is/arrays.xml

@@ -59,6 +59,7 @@
         <item>Þráðlaust net MAC</item>
         <item>Bluetooth MAC</item>
         <item>Tilkynning um opinn hugbúnað</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-it/arrays.xml

@@ -59,6 +59,7 @@
         <item>Wi-Fi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Avviso Open Source</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-lt/arrays.xml

@@ -59,6 +59,7 @@
         <item>„Wi-Fi“ MAC</item>
         <item>„Bluetooth“ MAC</item>
         <item>Atvirojo kodo paskelbimas</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-nb/arrays.xml

@@ -59,6 +59,7 @@
         <item>Wi-Fi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Kunngjøring om åpen kildekode</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-nl/arrays.xml

@@ -59,6 +59,7 @@
         <item>Wi-Fi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Open Source aankondiging</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-pl/arrays.xml

@@ -59,6 +59,7 @@
         <item>MAC Wi-Fi</item>
         <item>MAC Bluetooth</item>
         <item>Komunikat o oprogramowaniu otwartoźródłowym</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-pt/arrays.xml

@@ -59,6 +59,7 @@
         <item>MAC do Wi-Fi</item>
         <item>MAC do Bluetooth</item>
         <item>Anúncio de Código aberto</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-sl/arrays.xml

@@ -59,6 +59,7 @@
         <item>Wi-Fi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Obvestilo o odprti kodi</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

app/src/main/res/values-sv/arrays.xml

@@ -59,6 +59,7 @@
         <item>Wi-Fi-MAC</item>
         <item>Bluetooth-MAC</item>
         <item>Meddelande om öppen källkod</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

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

@@ -59,6 +59,7 @@
         <item>Wi-Fi MAC</item>
         <item>Bluetooth MAC</item>
         <item>Open Source Announcement</item>
+        <item>Children Privacy Policy</item>
     </string-array>
 
     <string-array name="camero_titls_array">

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

@@ -72,4 +72,47 @@
     <string name="input_name">Input name</string>
     <string name="ensure_guardian_summary">To ensure you are the guardian, please input the code from Xplora</string>
     <string name="next">Next</string>
+
+
+
+    <string name="children_privacy_policy_0">CHILDREN PRIVACY POLICY</string>
+    <string name="children_privacy_policy_0_content">We know it’s important to treat data you tell us is from children under 18 carefully. This Notice explains what we do (and don’t do) when it comes to children’s data.</string>
+
+    <string name="children_privacy_policy_1">What Children’s Data We Collect</string>
+    <string name="children_privacy_policy_1_content">We don’t knowingly collect data from or about children without the permission of their parent or guardian. When we do collect that data, we might do it directly, like when you sign up for a service. We might also collect it automatically if your child uses the products or services we offer. We collect the following data:</string>
+
+    <string name="children_privacy_policy_1_0">Geolocation Data</string>
+    <string name="children_privacy_policy_1_0_content">– we collect data that tells us the location of your child’s smart device.</string>
+
+    <string name="children_privacy_policy_1_1">Unique Identifiers</string>
+    <string name="children_privacy_policy_1_1_content">– we collect device and network identifiers - basically, ways for us to tell which smart device on our network is your child’s.</string>
+
+    <string name="children_privacy_policy_1_2">Customer Proprietary Network Information (“CPNI”)</string>
+    <string name="children_privacy_policy_1_2_content">generated by your child’s use of our wireless voice communications services. Information from your child’s use of our products, services, and network (and other carriers’ networks when roaming domestically or internationally) like usage of connecting carriers and Internet service providers, the Internet Protocol (“IP”) address, text messages, and data use history, content interactions (e.g., how long you use an app), language settings, and other network and device analytics and Wi-Fi connection and usage data.</string>
+
+    <string name="children_privacy_policy_1_3">Device and service performance and diagnostic information</string>
+    <string name="children_privacy_policy_1_3_content">– this includes reports from your child’s device about signal strength, speeds, app and service performance, dropped calls, call and data failures, geolocation information, and device data.</string>
+
+    <string name="children_privacy_policy_1_4">Back-up information</string>
+    <string name="children_privacy_policy_1_4_content">including data stored in back-ups and cloud services if your child’s device uploads information to XPLORA Mobile AS / XPLORA TECHNOLOGIES AS.</string>
+
+    <string name="children_privacy_policy_1_5">Audio information</string>
+    <string name="children_privacy_policy_1_5_content">including voice commands your child provides to our app (for example, for accessibility or hands-free use).</string>
+
+    <string name="children_privacy_policy_1_6">Child’s username</string>
+    <string name="children_privacy_policy_1_6_content">– For joining child friendly activity-based platform Xplora Goplay.</string>
+
+    <string name="children_privacy_policy_1_7">Data Usage</string>
+    <string name="children_privacy_policy_1_7_content">– this tells us the amount of data the hotspot uses, and IP addresses associated with websites visited.</string>
+
+    <string name="children_privacy_policy_1_8">Unique Identifiers</string>
+    <string name="children_privacy_policy_1_8_content">– we collect device and network identifiers - basically, ways for us to tell which hotspot on our network is your child’s.</string>
+
+
+    <string name="children_privacy_policy_2">How We Use Children’s Data</string>
+    <string name="children_privacy_policy_2_content">The main reason we collect children’s data is to provide the product or service that collected the data. But we may also use children’s data to do things like:</string>
+
+    <string name="children_privacy_policy_2_0">Create and administer accounts, complete transactions, payments, billing, and requests related to our products and services and third-party products and services charged to your accounts.</string>
+    <string name="children_privacy_policy_2_0_content"></string>
+
 </resources>