Merge pull request #14 from xLaMbChOpSx/master

Actionbar, Device Class rewrite, Notification, Database Helper Class and more

AndroidManifest.xml

@@ -40,13 +40,21 @@
         <activity
             android:name=".MapViewer"
             android:label="@string/app_name"
+            android:parentActivityName=".AIMSICD"
             android:exported="true">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".AIMSICD"/>
         </activity>
         <activity
             android:name=".ATRilHook"
-            android:label="@string/testing_RIL_OEMHook"
+            android:label="@string/at_ril_injection"
+            android:parentActivityName=".AIMSICD"
             android:process="com.android.phone"
             android:exported="true">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".AIMSICD"/>
         </activity>
 
     </application>

libs/android-support-v7-appcompat.jar.REMOVED.git-id

@@ -0,0 +1 @@
+045c79330c542825344ce10ab654ba0b0fcc2a0a

res/layout/main.xml

@@ -9,7 +9,7 @@
         android:id="@+id/view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/hello"
+        android:text="@string/app_name"
         android:typeface="monospace"
         android:textColor="#00FF00"/>
 </LinearLayout>

res/menu/main_menu.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/track_cell"
+          android:icon="@drawable/track_cell"
+          android:title="@string/track_cell"
+          android:showAsAction="ifRoom"/>
+    <item android:id="@+id/track_location"
+          android:icon="@drawable/ic_action_location_off"
+          android:title="@string/track_location"
+          android:showAsAction="ifRoom" />
+    <item android:id="@+id/track_signal"
+          android:icon="@drawable/ic_action_network_cell"
+          android:title="@string/track_signal"
+          android:showAsAction="ifRoom" />
+    <item android:id="@+id/show_map"
+          android:icon="@drawable/ic_action_map"
+          android:title="@string/show_map"
+          android:showAsAction="ifRoom" />
+    <item android:id="@+id/export_database"
+          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"
+          android:showAsAction="ifRoom" />
+    <item android:id="@+id/app_exit"
+          android:icon="@drawable/ic_action_remove"
+          android:title="@string/quit"
+          android:showAsAction="ifRoom" />
+</menu>

res/values/strings.xml

@@ -1,25 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello">no content</string>
-    <string name="app_name">Android IMSI-Catcher Detector</string>
+
+    <string name="app_name_short">AIMSICD</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>
     <string name="text_cancel">Cancel</string>
 
     <string name="device_info_title">Device Information</string>
-    <string name="oemrilhook_title">OEM RIL Hook</string>
 
-    <string name="text_no_busybox">Busybox was not detected on your device, would you like to install it now?</string>
-    <string name="text_busybox_not_installed">Busybox install failed, please confirm your phone has been rooted and su
-        binary installed.
-    </string>
-    <string name="text_no_microcom">The Microcom applet was not detected on your device, would you like to install it
-        now?
-    </string>
-    <string name="text_no_atinout">The ATinout applet was not detected on your device, would you like to install it
-        now?
-    </string>
+    <!-- Mobile Network Types -->
     <string name="gprs"># GPRS</string>
     <string name="edge"># EDGE</string>
     <string name="umts"># UMTS</string>
@@ -30,10 +21,26 @@
     <string name="evo0"># EVO-0</string>
     <string name="evoA"># EVO-A</string>
 
-    <!--For RIL OEM HOOK testing-->
+    <!-- MENU -->
+    <string name="track_cell">Track Cell Details</string>
+    <string name="untrack_cell">Untrack Cell Details</string>
+    <string name="track_location">Track Location</string>
+    <string name="untrack_location">Untrack Location</string>
+    <string name="track_signal">Track Signal</string>
+    <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="press_once_again_to_exit">Press again to exit</string>
+
+    <!-- Location Helper -->
+    <string name="location_error_title">Location Services Disabled</string>
+    <string name="location_error_message">Would you like to enable Location Services to track GPS Data?</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">API 1 (datalen=0)</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>