Merge pull request #24 from xLaMbChOpSx/master

Universal Compatibility Commit
CellularPrivacy · Apr 9, 2014 · d9fc10d · d9fc10d
2 parents 1fb88e9 + 3ca7bbd
commit d9fc10d
Show file tree

Hide file tree

Showing 16 changed files with 316 additions and 769 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.SecUpwN.AIMSICD"
-          android:versionName="0.1.1"
-          android:versionCode="3"
-          android:sharedUserId="android.uid.phone">
+          android:versionName="0.1.5"
+          android:versionCode="5">
 
     <uses-sdk
         android:minSdkVersion="9"
@@ -15,9 +14,10 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 
     <application
-        android:icon="@drawable/icon"
+        android:icon="@drawable/sense_alarm"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:allowBackup="false">
@@ -26,7 +26,6 @@
         <activity
             android:name=".AIMSICD"
             android:label="@string/app_name_short"
-            android:process="com.android.phone"
             android:screenOrientation="portrait"
             android:exported="true">
             <intent-filter>
@@ -39,7 +38,6 @@
 
         <service
             android:name=".service.AimsicdService"
-            android:process="com.android.phone"
             android:enabled="true"
             android:exported="false">
         </service>
@@ -60,15 +58,16 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".AIMSICD"/>
         </activity>
+
         <activity
-            android:name=".ATRilHook"
-            android:label="@string/at_ril_injection"
+            android:name=".SettingsActivity"
+            android:label="@string/preferences"
+            android:icon="@drawable/ic_action_settings"
             android:parentActivityName=".AIMSICD"
-            android:process="com.android.phone"
             android:exported="true">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".AIMSICD"/>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
         </activity>
 
     </application>

diff --git a/libs/frameworks_all.jar b/libs/frameworks_all.jar
diff --git a/libs/telephony.jar b/libs/telephony.jar
diff --git a/res/drawable-hdpi/ic_action_settings.png b/res/drawable-hdpi/ic_action_settings.png
diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
diff --git a/res/layout/riloemhook_layout.xml b/res/layout/riloemhook_layout.xml
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
@@ -21,9 +21,9 @@
           android:icon="@drawable/ic_action_import_export"
           android:title="@string/export_database"
           android:showAsAction="ifRoom" />
-    <item android:id="@+id/at_injector"
-          android:icon="@drawable/ic_action_computer"
-          android:title="@string/at_ril_injection"
+    <item android:id="@+id/preferences"
+          android:icon="@drawable/ic_action_settings"
+          android:title="@string/preferences"
           android:showAsAction="ifRoom" />
     <item android:id="@+id/app_exit"
           android:icon="@drawable/ic_action_remove"

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="pref_ui_icons_entries">
+        <item>"Flat"</item>
+        <item>"Sense"</item>
+        <item>"White"</item>
+    </string-array>
+
+    <string-array name="pref_ui_icons_values">
+        <item>"1"</item>
+        <item>"2"</item>
+        <item>"3"</item>
+    </string-array>
+
+    <array name="pref_ui_icon_display">
+        <item>@drawable/flat_good</item>
+        <item>@drawable/sense_good</item>
+        <item>@drawable/white_good</item>
+    </array>
+
+</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="IconListPreference">
+        <attr name="entryIcons" format="reference" />
+    </declare-styleable>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <string name="app_name_short">AIMSICD</string>
-    <string name="app_name">Android IMSI Catcher Detector</string>
+    <string name="app_name">Android IMSI-Catcher Detector</string>
     <string name="strength">Signal strength</string>
     <string name="quit">Quit</string>
     <string name="text_ok">OK</string>
@@ -30,7 +30,7 @@
     <string name="untrack_signal">Untrack Signal</string>
     <string name="show_map">Show Map</string>
     <string name="export_database">Export Database tables</string>
-    <string name="at_ril_injection">AT Command Injection</string>
+    <string name="preferences">Preferences</string>
     <string name="press_once_again_to_exit">Press again to exit</string>
 
     <!-- MAIN LAYOUT -->
@@ -54,21 +54,22 @@
     <string name="data_activity">Data Activity:</string>
     <string name="data_status">Data Status:</string>
 
-
-
-    <!-- Location Helper -->
+    <!-- LOCATION HELPER -->
     <string name="location_error_title">Location Services Disabled</string>
     <string name="location_error_message">You cannot track GPS data without enabling Location Services.</string>
 
-    <!-- AT Injection Activity -->
-    <string name="testing_RIL_OEMHook">RIL OEM Hook Test</string>
-    <string name="ril_oem_choose">Choose a RIL OEM Hook API to test:</string>
-    <string name="radio_api1">CRSM - RilStrings</string>
-    <string name="radio_api2">API 2 (datalen=1)</string>
-    <string name="radio_api3">API 3 (datalen=6)</string>
-    <string name="radio_api4">API 4 Type command :</string>
-    <string name="radio_api5">Ciphering Indicator - RilRAW</string>
-    <string name="radio_api6">Ciphering Indicator - ServiceMode</string>
-    <string name="radio_run">RUN</string>
-    <string name="ril_oem_response">Module response:</string>
+    <!-- PREFERENCES -->
+    <string name="pref_system_title">System Settings</string>
+    <string name="pref_autostart_title">Auto Start</string>
+    <string name="pref_autostart_summ">Automatically start service on boot</string>
+    <string name="pref_protection_title">Protection Settings</string>
+    <string name="pref_femto_title">FemtoCell</string>
+    <string name="pref_femto_summ">FemtoCell Detection (CDMA Phones ONLY)</string>
+    <string name="pref_femto_action_title">FemtoCell Protection</string>
+    <string name="pref_femto_action_summ">Enforce Airplane Mode when FemtoCell detected</string>
+    <string name="pref_ui_title">Interface Settings</string>
+    <string name="pref_ui_icons_title">Icons</string>
+    <string name="pref_ui_icons_summ">Icon Theme Selection</string>
+
+
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aimsicd="http://schemas.android.com/apk/res/com.SecUpwN.AIMSICD">
+
+    <PreferenceCategory
+        android:title="@string/pref_system_title"
+        android:key="pref_key_system_settings">
+    <CheckBoxPreference
+        android:key="pref_autostart"
+        android:title="@string/pref_autostart_title"
+        android:summary="@string/pref_autostart_summ"
+        android:defaultValue="true" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_protection_title"
+        android:key="pref_key_protection_settings">
+        <CheckBoxPreference
+            android:key="pref_femto_detection"
+            android:title="@string/pref_femto_title"
+            android:summary="@string/pref_femto_summ"
+            android:defaultValue="false" />
+        <CheckBoxPreference
+            android:key="pref_femto_action"
+            android:title="@string/pref_femto_action_title"
+            android:summary="@string/pref_femto_action_summ"
+            android:defaultValue="false" />
+        </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_ui_title"
+        android:key="pref_key_ui_settings">
+        <ListPreference
+            android:key="pref_ui_icons"
+            android:title="@string/pref_ui_icons_title"
+            android:dialogTitle="@string/pref_ui_icons_summ"
+            android:entries="@array/pref_ui_icons_entries"
+            android:entryValues="@array/pref_ui_icons_values"
+            aimsicd:entryIcons="@array/pref_ui_icon_display"/>
+    </PreferenceCategory>
+
+</PreferenceScreen>