import org.iilab.pb.common.AppConstants;

.gitignore

@@ -19,23 +19,37 @@ local.properties
 .classpath
 .project
 
-# Intellij files
-.idea/
-*.iml
+# Android Studio files
 out/
 **.DS_Store
 target/
 tmp/
 coverage.ec
+.idea/libraries
+.idea/tasks.xml
+.idea/vcs.xml
+.idea/workspace.xml
+.idea/gradle.xml
+
+# Gradle files
+.gradle/
+.gradletasknamecache
+build/
+
+# Proguard folder generated by Eclipse
+proguard/
 
-# calabash files
+# Log Files
+*.log
 
-/test_servers/
-/*.png
-*.html
-cucumber.json
-*.keystore
-calabash_settings
+###IntelliJ###
+
+*.iml
+*.ipr
+*.iws
+.idea/
 
-# Crashlytics
-res/values/com_crashlytics_export_strings.xml
+# Lint
+lint-report.html
+lint-report_files/
+lint_result.txt

.travis.yml

@@ -0,0 +1,54 @@
+
+language: android
+jdk: oraclejdk7
+
+env:
+  global:
+    # switch glibc to a memory conserving mode
+    - MALLOC_ARENA_MAX=2
+    # wait 5 minutes for adb to connect to emulator. Travis-ci cancels a
+    # stalled build after 10 minutes, so this should be shorter than that so
+    # there is time for the build to report the error.
+    - ADB_INSTALL_TIMEOUT=5
+
+android:
+  components:
+    - tools
+    - platform-tools
+    - extra-android-m2repository
+    - build-tools-23.0.2
+    - android-23
+  licenses:
+    # only approve the Android software licenses, they match sources
+    # the Google licenses mean proprietary software with binary blobs
+    - 'android-sdk-preview-license-52d11cd2'
+    - 'android-sdk-license-.+'
+
+
+licenses:
+    # only approve the Android software licenses, they match sources
+    # the Google licenses mean proprietary software with binary blobs
+    - 'android-sdk-preview-license-52d11cd2'
+    - 'android-sdk-license-.+'
+
+sudo: false
+notifications:
+  email: false
+
+script:
+  # 'assemble' everything and run all checks that do not require a device/emulator
+  # first with the wrapper, then with the system gradle
+  - ./gradlew clean build
+  - gradle clean build
+  # start the emulator after the build to conserve memory
+
+  #- echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
+  # - emulator -avd test -no-skin -no-audio -no-window &
+  #- android-wait-for-emulator
+  #- adb shell input keyevent 82 &
+  # now run the tests that require a device/emulator
+  #- gradle connectedCheck
+
+
+after_failure:
+  - find * -name lint-results.xml | xargs cat

CHANGELOG.md

@@ -0,0 +1,75 @@
+# **Change Log**
+
+All notable changes to this project will be documented in this file. 
+Unreleased
+
+
+##  **[v.1.4.1] - 2015-09-21**
+
+### **Added**
+
+-	Added “Stop alert message” box in message screen once the setup is done.#69
+
+### **Changed**
+
+-	Handling the nested fragments for contact screen programatically. #81
+- Handling the nested fragments for message screen programatically. #98
+ -Long press time is reduced from 5 seconds to 3 seconds in disguise screen.#90
+
+### **Fixed**
+
+- On some devices, the contact selection screen was malfunctioning. #57
+
+## **[v.1.4.0](https://github.com/PanicInitiative/PanicButton/releases/tag/v1.4.0) - 2015-04-21**
+
+### **Added**
+
+-	Added “Stop alert message” box in message screen once the setup is done.#69
+
+### **Changed**
+
+- The trigger mechanism has changed and now requires a confirmation press
+-	When the alert is manually deactivated (after entering your PIN) your contacts will receive a message which says "The alert has been stopped"
+- The information text is clearer regarding what Panic Button does. When you trigger the alert, Panic Button will start sending a message with your location every 5 minutes.
+- 	German translation generously contributed by https://github.com/emdete
+
+### **Fixed**
+
+- One some devices, the alert activates by itself in the middle of phone calls (it activates without triggering it with the power button or the calc app) #38
+- Shortcut was created by Google Play. #35
+
+##  **[v.1.4.0 -alpha] (https://github.com/PanicInitiative/PanicButton/releases/tag/1.4.0-alpha)- 2015-04-06**
+
+### **Changed**
+- The trigger mechanism has changed and now requires a confirmation press.
+- The information text is clearer regarding what Panic Button does. When you trigger the alert, Panic Button will start sending a message with your location every 5 minutes
+
+### **Fixed**
+- On some devices, the alert activates by itself in the middle of phone calls (it activates without triggering it with the power button or the calc app). #38
+- Shortcut was created by Google Play #35
+
+
+##  **[v.1.3.1-alpha] (https://github.com/PanicInitiative/PanicButton/releases/tag/v1.3.1)- 2014-08-06**
+
+### **Fixed**
+
+- On some devices, the alert activates by itself in the middle of phone calls (it activates without triggering it with the power button or the calc app). #38
+- Shortcut was created by Google Play #35
+
+
+##  **[v.1.3.0] (https://github.com/PanicInitiative/PanicButton/releases/tag/v1.3.0)- 2014-06-23**
+
+### **Changed**
+
+- The first message is now the customised message, while subsequent ones only contain the location or a location pending message #41
+- Clicking Done on the keyboard when entering the PIN automatically validates it. #27
+- Link to map is now using https: #28
+- Removed Content API to reduce the attack surface. #40
+- The help pages now contain more information about the risk of contact and message exposure #33
+
+### **Fixed**
+
+- Clicking on the Security Tips link in the checklist now links properly to the Help section. #30
+- Fixed bug where two SMS were sent when the alert was active & location was retrieved for the first time
+- Fixed problem where pushing the back button from the checklist exited to the calculator disguise.
+

README.md

@@ -1,4 +1,4 @@
- Master [![Build Status](https://ci.iilab.org/buildStatus/icon?job=panic-button)](https://ci.iilab.org/job/panic-button/) Dev [![Build Status](https://ci.iilab.org/buildStatus/icon?job=panic-button-dev)](https://ci.iilab.org/job/panic-button-dev/) [![Stories in Ready](https://badge.waffle.io/PanicInitiative/PanicButton.png?label=ready&title=Ready)](https://waffle.io/PanicInitiative/PanicButton)
+Master [![Build Status](https://ci.iilab.org/buildStatus/icon?job=panic-button)](https://ci.iilab.org/job/panic-button/) Dev [![Build Status](https://travis-ci.org/PanicInitiative/PanicButton.svg?branch=dev)](https://travis-ci.org/PanicInitiative/PanicButton) [![Stories in Ready](https://badge.waffle.io/PanicInitiative/PanicButton.png?label=ready&title=Ready)](https://waffle.io/PanicInitiative/PanicButton)
 
 # Panic Button
 
@@ -36,18 +36,22 @@ A huge thanks is also owed to the many programmers and designers who have donate
 
 ## Technology
 
-### Requirements
+### Security
 
-You need an Android phone with a minimum version of 2.3.3 
+Read [our security documentation](SECURITY.md) to understand our approach.
 
-### Building
+### Requirements
 
-See the [notes to build your own APK](./docs/BUILD.md)
+You need an Android phone with a minimum version of 2.3.3
 
 ### Contributing
 
 See the [issues tagged with "Help Wanted"](https://github.com/iilab/PanicButton/labels/help%20wanted).
 
-~~See the [notes to setup a development environment](./docs/DEVELOPMENT.md)~~ Outdated. Migration to Android Studio/Gradle in progress see #76.
+Migration to Android Studio/Gradle has been completed on the ```dev``` branch which will be merged with ```master``` on the next public release.
 
 Code contributions should be sent via github from [feature](http://codeinthehole.com/writing/pull-requests-and-other-good-practices-for-teams-using-github/) [branches](https://guides.github.com/introduction/flow/) (named feature/__descriptive_name_of_feature__) as pull requests [as explained here](https://help.github.com/articles/using-pull-requests).
+
+### Translations
+
+We'e working on improving how translations are managed. Read more about this and let us know your ideas on the [dedicated github issue](https://github.com/iilab/PanicButton/issues/82)!

app/build.gradle

@@ -0,0 +1,54 @@
+
+apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
+apply plugin: 'witness'
+
+    android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
+
+    defaultConfig {
+        applicationId "org.iilab.pb"
+        minSdkVersion 10
+        targetSdkVersion 23
+    }
+        lintOptions {
+            abortOnError false
+        }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.google.code.gson:gson:2.3'
+    compile 'com.android.support:support-v4:23.1.+'
+    compile 'com.android.support:preference-v7:23.1.0'
+    testCompile "org.robolectric:robolectric:3.0"
+    testCompile "org.robolectric:shadows-support-v4:3.0"
+    testCompile 'junit:junit:4.12'
+    testCompile "org.mockito:mockito-core:1.9.5"
+    compile('com.crashlytics.sdk.android:crashlytics:2.5.2@aar') {
+        transitive = true;
+    }
+}
+
+// generate using: `gradle -q calculateChecksums | sort -V`
+dependencyVerification {
+    verify = [
+            'com.google.code.gson:gson:9466512cd8cf0bd66a8a3661685373f7b3deafded11096e044926ff5c82c7a4c',
+            'com.android.support:support-v4:5c7dceb6c824089fe80f502e5206264048ef8bffa4e8ddeab180b81723e79b7f',
+            'com.android.support:preference-v7:f6d15f2bf404321f6e820eaf2086b67aaa849afdda5c9a69ec7a282b3d76fdb8',
+            'com.crashlytics.sdk.android:crashlytics:5bbf76250f6349baf173e082b4f7d14e777aa5a7510f9bea267b445bc439247d',
+            'com.android.support:support-annotations:f347a35b9748a4103b39a6714a77e2100f488d623fd6268e259c177b200e9d82',
+            'com.android.support:appcompat-v7:b5783b390d1440769c9b8a7b42290523a4ff058ef2d3fb90c983973934ca115b',
+            'com.android.support:recyclerview-v7:464ec6e5004400a4fe0310f35343da9e5a2912386a3606db3585f7cf987c444a',
+            'com.crashlytics.sdk.android:answers:5af101ef6b58a26dd32cfc13f53c63c33fb2fdcdf6990241eca22e7a8c842847',
+            'io.fabric.sdk.android:fabric:15465f60ee6a2bb53dcf84e8dd939ce92dffbffc73bfdd3432b63fa6ee2f7bae',
+            'com.crashlytics.sdk.android:crashlytics-core:2f35df62420723d4a8e58f58a376fb640d11e1660656a9aa2959bb041b5b1d15',
+            'com.crashlytics.sdk.android:beta:6d7dce749fd70fa20adcf089aaed5d52f9e8e2a08f6666336e90a7555cee9718',
+    ]
+}

app/fabric.properties

@@ -0,0 +1,3 @@
+#Contains API Secret used to validate your application. Commit to internal source control; avoid making secret public.
+#Mon Oct 05 12:28:54 EST 2015
+apiSecret=d724cfd2763e31304a850c7ef847c60de4f79ef942b15de09a8bed2e0085ce80

app/lint.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lint>
+    <issue id="MissingPrefix" severity="ignore"/>
+    <issue id="MissingTranslation" severity="ignore"/>
+    </lint>

AndroidManifest.xml → app/src/main/AndroidManifest.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="137" android:versionName="1.4.0" package="org.iilab.pb">
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="18"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="138" android:versionName="1.4.1" package="org.iilab.pb">
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="22"/>
 
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <!--<uses-permission android:name="android.permission.INTERNET" />-->
     <uses-permission android:name="android.permission.SEND_SMS"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ -13,12 +12,11 @@
     <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="android.permission.READ_LOGS"/>
 
-    <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">
+    <application android:allowBackup="true" android:icon="@drawable/icon_calculator" android:label="@string/app_name"
+        android:name=".common.ApplicationSettings" android:theme="@style/AppTheme">
 
         <activity android:excludeFromRecents="true" android:label="@string/app_name_setup" android:name=".HomeActivity" android:noHistory="true" android:screenOrientation="portrait">
             <intent-filter>
@@ -42,11 +40,11 @@
         </activity-alias>
 
         <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:name=".WizardModalActivity" android:screenOrientation="portrait" android:theme="@style/Theme.AppCompat.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"/>
+        <activity android:excludeFromRecents="true" android:name=".MainModalActivity" android:screenOrientation="portrait" android:theme="@style/Theme.AppCompat.Transparent"/>
 
         <service android:name=".trigger.HardwareTriggerService"/>
 
@@ -71,6 +69,20 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name=".receiver.UpdateReceiver$LegacyUpdateReceiver" android:enabled="@bool/is_at_most_api_11" >
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REPLACED" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".receiver.UpdateReceiver" android:enabled="@bool/is_at_least_api_12" >
+            <intent-filter>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="869571b41e0cb553a5cb99aa56d26a0f06ca7015" />
 
     </application>
 </manifest>

assets/help_de.json → app/src/main/assets/help_de.json

@@ -1,6 +1,6 @@
 {
   "help": {
-    "version" : 7,
+    "version" : "7",
     "data":[    
     {
       "id" : "help",

assets/help_en.json → app/src/main/assets/help_en.json

@@ -1,6 +1,6 @@
 {
   "help": {
-    "version" : 7,
+    "version" : "7",
     "data":[    
     {
       "id" : "help",

assets/help_es.json → app/src/main/assets/help_es.json

@@ -1,6 +1,6 @@
 {
   "help": {
-    "version" : 7,
+    "version" : "7",
     "data":[    
     {
       "id" : "help",

assets/help_fr.json → app/src/main/assets/help_fr.json

@@ -1,6 +1,6 @@
 {
   "help": {
-    "version" : 7,
+    "version" : "7",
     "data":[    
     {
       "id" : "help",