Merge branch 'dev'

PanicInitiative · Jun 21, 2014 · 236f9e1 · 236f9e1
2 parents 4a79c95 + 32ebe40
commit 236f9e1
Show file tree

Hide file tree

Showing 135 changed files with 1,108 additions and 810 deletions.
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.apb.beacon"
-          android:versionCode="1"
-          android:versionName="${app.version.name}">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="123" android:versionName="1.2.7" package="org.iilab.pb">
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
+
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -13,96 +11,66 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.GET_TASKS"/>
 
-    <application android:icon="@drawable/icon_calculator"
-                 android:theme="@android:style/Theme.Light.NoTitleBar"
-                 android:label="@string/app_name"
-                 android:allowBackup="true">
+    <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/icon_calculator" android:label="@string/app_name" android:name=".common.ApplicationSettings" android:theme="@android:style/Theme.Light.NoTitleBar">
 
-        <activity android:name=".HomeActivity"
-                  android:screenOrientation="portrait"
-                  android:label="@string/app_name_setup"
-                  android:excludeFromRecents="true"
-                  android:noHistory="true">
+        <activity android:excludeFromRecents="true" android:label="@string/app_name_setup" android:name=".HomeActivity" android:noHistory="true" android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <!--<category android:name="android.intent.category.LAUNCHER"/>-->
             </intent-filter>
         </activity>
 
-        <activity-alias android:label="@string/app_name_setup"
-            android:icon="@drawable/icon_setup"
-            android:name=".HomeActivity-setup"
-            android:enabled="true"
-            android:targetActivity=".HomeActivity">
+        <activity-alias android:enabled="true" android:icon="@drawable/icon_setup" android:label="@string/app_name_setup" android:name=".HomeActivity-setup" android:targetActivity=".HomeActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity-alias>
 
-        <activity-alias android:label="@string/app_name"
-            android:icon="@drawable/icon_calculator"
-            android:name=".HomeActivity-calculator"
-            android:enabled="false"
-            android:targetActivity=".HomeActivity">
+        <activity-alias android:enabled="false" android:icon="@drawable/icon_calculator" android:label="@string/app_name" android:name=".HomeActivity-calculator" android:targetActivity=".HomeActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity-alias>
 
-        <activity android:name=".WizardActivity"
-                  android:screenOrientation="portrait"
-                  android:excludeFromRecents="true"/>
-        <activity android:name=".WizardModalActivity"
-            android:theme="@style/Theme.Transparent"
-                  android:screenOrientation="portrait"
-                  android:excludeFromRecents="true"/>
-        <activity android:name=".CalculatorActivity"
-                  android:launchMode="singleTask"
-                  android:screenOrientation="portrait"
-                  android:excludeFromRecents="true"/>
-        <activity android:name=".LoginActivity"
-                  android:noHistory="true"
-                  android:screenOrientation="portrait"
-                  android:excludeFromRecents="true"/>
-        <activity android:name=".MainActivity"
-            android:screenOrientation="portrait"
-            android:excludeFromRecents="true"/>
-		<activity android:name=".MainModalActivity"
-		    android:theme="@style/Theme.Transparent"
-                  android:screenOrientation="portrait"
-                  android:excludeFromRecents="true"/>
-
+        <activity android:excludeFromRecents="true" android:name=".WizardActivity" android:screenOrientation="portrait"/>
+        <activity android:excludeFromRecents="true" android:name=".WizardModalActivity" android:screenOrientation="portrait" android:theme="@style/Theme.Transparent"/>
+        <activity android:excludeFromRecents="true" android:launchMode="singleTask" android:name=".CalculatorActivity" android:screenOrientation="portrait"/>
+        <activity android:excludeFromRecents="true" android:name=".LoginActivity" android:noHistory="true" android:screenOrientation="portrait"/>
+        <activity android:excludeFromRecents="true" android:name=".MainActivity" android:screenOrientation="portrait"/>
+        <activity android:excludeFromRecents="true" android:name=".MainModalActivity" android:screenOrientation="portrait" android:theme="@style/Theme.Transparent"/>
+
         <service android:name=".trigger.HardwareTriggerService"/>
 
-        <receiver android:name=".trigger.BootReceiver" android:enabled="true" android:exported="false">
+        <receiver android:enabled="true" android:exported="false" android:name=".trigger.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".location.LocationUpdateReceiver" android:enabled="true" android:exported="false">
+        <receiver android:enabled="true" android:exported="false" android:name=".location.LocationUpdateReceiver">
             <intent-filter>
-                <action android:name="com.apb.beacon.LOCATION_UPDATE_ACTION"/>
+                <action android:name="org.iilab.pb.LOCATION_UPDATE_ACTION"/>
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".alert.AlarmReceiver" android:enabled="true" android:exported="false">
+        <receiver android:enabled="true" android:exported="false" android:name=".alert.AlarmReceiver">
             <intent-filter>
-                <action android:name="com.apb.beacon.SEND_ALERT_ACTION"/>
+                <action android:name="org.iilab.pb.SEND_ALERT_ACTION"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="org.iilab.pb.SEND_ALERT_ACTION_SINGLE"/>
             </intent-filter>
         </receiver>
-
-
-
-    </application>
-</manifest>
 
+
+    </application>
+</manifest>
diff --git a/assets/help_en.json b/assets/help_en.json
@@ -38,7 +38,7 @@
       "title" : "Managing Your Risks",
       "heading" : "Managing Your Risks",
       "section_order" : "1",
-      "content" : "<h1>Managing Your <strong>Risks</strong></h1><h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
+      "content" : "<h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
       "items" : [
         {
           "title" : "Assessing your risk",

diff --git a/assets/help_es.json b/assets/help_es.json
@@ -38,7 +38,7 @@
       "title" : "Managing Your Risks",
       "heading" : "Managing Your Risks",
       "section_order" : "1",
-      "content" : "<h1>Managing Your <strong>Risks</strong></h1><h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
+      "content" : "<h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
       "items" : [
         {
           "title" : "Assessing your risk",

diff --git a/assets/help_fr.json b/assets/help_fr.json
@@ -38,7 +38,7 @@
       "title" : "Managing Your Risks",
       "heading" : "Managing Your Risks",
       "section_order" : "1",
-      "content" : "<h1>Managing Your <strong>Risks</strong></h1><h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
+      "content" : "<h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
       "items" : [
         {
           "title" : "Assessing your risk",

diff --git a/assets/help_ph.json b/assets/help_ph.json
@@ -38,7 +38,7 @@
       "title" : "Managing Your Risks",
       "heading" : "Managing Your Risks",
       "section_order" : "1",
-      "content" : "<h1>Managing Your <strong>Risks</strong></h1><h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
+      "content" : "<h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
       "items" : [
         {
           "title" : "Assessing your risk",

diff --git a/assets/help_pt.json b/assets/help_pt.json
@@ -38,7 +38,7 @@
       "title" : "Managing Your Risks",
       "heading" : "Managing Your Risks",
       "section_order" : "1",
-      "content" : "<h1>Managing Your <strong>Risks</strong></h1><h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
+      "content" : "<h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
       "items" : [
         {
           "title" : "Assessing your risk",

diff --git a/assets/mobile_en.json b/assets/mobile_en.json
@@ -333,7 +333,7 @@
       "title" : "Checklist",
       "action" : [{"title":"Disguise Now","link":"close"},{"title":"Cancel","link":"home-ready","status":"disabled"}],
       "checklist" : [{"title":"Review security plan and update contacts regularly"},{"title":"Test the alert to ensure it is working"},{"title":"Ensure sufficient credit on the phone"},{"title":"Activate GPS (if you want to enable location tracking)"},{"title":"Charge phone battery to full"}],
-      "content" : "<p>More <a href=\"#help-charge\">security tips...</a></p>"
+      "content" : "<p>More <a href=\"help_risk\">security tips...</a></p>"
     }]
   }
 }
diff --git a/assets/mobile_es.json b/assets/mobile_es.json
@@ -332,7 +332,7 @@
       "title" : "Lista de verificación",
       "action" : [{"title":"Aceptar","link":"close"},{"title":"Cancelar","link":"home-ready","status":"disabled"}],
       "checklist" : [{"title":"Revisar plan de seguridad y actualizar contactos regularmente"},{"title":"Prueba la alerta para asegurarte que funcione"},{"title":"Asegurate de tener suficiente crédito en tu teléfono móvil"},{"title":"Activa el GPS (si deseas que tu ubicación se incluya en el mensaje)"},{"title":"Carga la batería de tu teléfono completamente"}],
-      "content" : "<p><a href=\"#help-charge\">Consejos sobre seguridad...</a></p>"
+      "content" : "<p><a href=\"help_risk\">Consejos sobre seguridad...</a></p>"
     }]
   }
 }
diff --git a/assets/mobile_fr.json b/assets/mobile_fr.json
@@ -332,7 +332,7 @@
       "title" : "Check-list",
       "action" : [{"title":"OK","link":"close"},{"title":"Annuler ","link":"home-ready","status":"disabled"}],
       "checklist" : [{"title":"Revoir la stratégie de sécurité et mettre à jour les contacts régulièrement"},{"title":"Tester l'alerte pour vérifier qu'elle fonctionne"},{"title":"Vérifier qu'il y a assez de crédit sur le téléphone"},{"title":"Activer le GPS (si vous souhaitez signaler votre position géographique"},{"title":"Recharger complètement la batterie"}],
-      "content" : "<p>More <a href=\"#help-charge\">conseils de sécurité...</a></p>"
+      "content" : "<p>More <a href=\"help_risk\">conseils de sécurité...</a></p>"
     }]
   }
 }
diff --git a/assets/mobile_ph.json b/assets/mobile_ph.json
@@ -316,7 +316,7 @@
       "title" : "Checklist",
       "action" : [{"title":"OK","link":"close"},{"title":"Cancel","link":"home-ready","status":"disabled"}],
       "checklist" : [{"title":"The application will be disguised"},{"title":"Review security plan and update trusted contacts regularly"},{"title":"Test setting off the alarm to ensure it is working"},{"title":"Ensure sufficient credit on the phone"},{"title":"Activate GPS (if you want to enable location tracking)"},{"title":"Charge phone battery to full"}],
-      "content" : "<p>More <a href=\"#help-charge\">security tips...</a></p>"
+      "content" : "<p>More <a href=\"help_risk\">security tips...</a></p>"
     },]
   }
 }
diff --git a/assets/mobile_pt.json b/assets/mobile_pt.json
@@ -325,7 +325,7 @@
       "title" : "Lista de Controle",
       "action" : [{"title":"Disfarce agora","link":"close"},{"title":"Cancelar","link":"home-ready","status":"disabled"}],
       "checklist" : [{"title":"Revisar plano de segurança  e atualizar os contatos regularmente"},{"title":"Testar o alerta para garantir que  está funcionando"},{"title":"Verificar se tem  crédito suficiente no telefone"},{"title":"Ativar GPS (se quiser habilitar o rastreamento de localização)"},{"title":"Carregar completamente a bateria do telefone"}],
-      "content" : "<p>Mais <a href=\"#help-charge\">dicas de segurança... </a></p>"
+      "content" : "<p>Mais <a href=\"help_risk\">dicas de segurança... </a></p>"
     }]
   }
 }
diff --git a/features/3_wizard_message.feature b/features/3_wizard_message.feature
@@ -18,7 +18,7 @@ Feature: Message setup in the Wizard
     Then I see the text "Next"
     Then I verify "Next" button is "enabled"
     Then I see the text "Help me, I'm in danger"
-    Then I see the text "I'm at http://maps.google.com/GPS-location"
+    Then I see the text "I'm at https://maps.google.com/GPS-location"
 
   Scenario: Navigating back to start screen
     When I go back

diff --git a/features/README.md b/features/README.md
@@ -11,7 +11,7 @@ To run your test:
 
 For example:
 
-     calabash-android run target/panic-button-dev.apk MAIN_ACTIVITY=com.apb.beacon.HomeActivity
+     calabash-android run target/panic-button-dev.apk MAIN_ACTIVITY=org.iilab.pb.HomeActivity
 
 Calabash-android will install an instrumentation along with your app when executing the app. We call this instrumentation for "test server". The "test server" has special permission that allows it to interact very closely with your app during test.
 Everytime you test a new binary or use an upgraded version of calabash a new test server will be build.

diff --git a/features/step_definitions/custom_steps.rb b/features/step_definitions/custom_steps.rb
@@ -23,7 +23,7 @@
 end
 
 And(/^I start application$/) do
-  Device.adb_command("shell am start -n com.apb.beacon/.HomeActivity")
+  Device.adb_command("shell am start -n org.iilab.pb/.HomeActivity")
 end
 
 And(/^I clear log$/) do
@@ -32,7 +32,7 @@
 
 And(/^I check sms text contains "(.*?)"$/) do |sms_text|
   # Get sms text
-  log_input = "adb logcat -d -n5 -s \"com.apb.beacon.alert.SMSAdapter\""
+  log_input = "adb logcat -d -n5 -s \"org.iilab.pb.alert.SMSAdapter\""
   log_output = `#{log_input}`
   print log_output