CellularPrivacy · duongynhi000005-oss · Mar 25, 2017 · Mar 25, 2017 · Mar 25, 2017 · Mar 25, 2017
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -1,5 +1,4 @@
 # Contribution Guide
---------------------
 
 Thank you for contributing! Please select:
 
@@ -12,9 +11,7 @@ Thank you for contributing! Please select:
 * [Donating](https://github.com/CellularPrivacy/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#donating)
 * [Respecting](https://github.com/CellularPrivacy/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#code-of-conduct)
 
----
-
-#### DEVELOPING
+## DEVELOPING
 
 Feel invited to develop with us using these steps:
 
@@ -26,9 +23,7 @@ Feel invited to develop with us using these steps:
 6. Test your changes and submit a [pull request](https://help.github.com/articles/using-pull-requests/) when we shall add it.
 7. Don't be shy to ask for help in an Issue and feel invited to [contact us](https://github.com/CellularPrivacy/Android-IMSI-Catcher-Detector/wiki/Contact).
 
----
-
-#### TRANSLATING
+## TRANSLATING
 
 Let our app start up in your native language!
 
@@ -37,9 +32,7 @@ Let our app start up in your native language!
 * Please make sure to *finish* your translation, if you start a new one!
 * Translations will be pulled into our GitHub automatically. Enjoy!
 
----
-
-#### TESTING
+## TESTING
 
 Can't code (yet)? No problem, we love you too!
 
@@ -49,9 +42,7 @@ Can't code (yet)? No problem, we love you too!
 4. Test all functions of our app and check for possible translation bugs.
 5. Share [our website](https://secupwn.github.io/Android-IMSI-Catcher-Detector) and [Media Material](https://github.com/CellularPrivacy/Android-IMSI-Catcher-Detector/wiki/Media-Material) or [tweet about us](https://twitter.com/AIMSICD).
 
----
-
-#### FORMATTING
+## FORMATTING
 
 Useful links to help you with correctly formatting posts.
 
@@ -63,13 +54,10 @@ Useful links to help you with correctly formatting posts.
 * [Markdown Tables Generator](http://www.tablesgenerator.com/markdown_tables)
 * [Code/Syntax Highlighting](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml)
 
----
-
-#### DEBUGGING
+## DEBUGGING
 
 Thanks for helping us squashing bugs! Please be patient.
 
----
 **Important Bug Submission Rules:**
 
 1. **SAFETY FIRST:** Remove CID, LAT, IMEI, IMSI and phone number from logs you submit!
@@ -80,8 +68,6 @@ Thanks for helping us squashing bugs! Please be patient.
 6. Describe your Issue as thoroughly as possible and *add logs* so that we can reproduce it.
 8. Maintain your filed Issues! Nothing is more annoying than unresponsive bug reporters.
 
----
-
 In all cases, you **MUST** include the following:
 
 * AIMSICD version (see the About-Tab within our app)
@@ -91,8 +77,6 @@ In all cases, you **MUST** include the following:
 * Logcat from button `Debugging` in Navigation Drawer (remove personal data)
 * Feel free to attach any other logs made by a logcat tool like [MatLog](https://github.com/plusCubed/matlog)
 
----
-
 Command line junkie?
 
 Then you can use the following shell function to help you get only relevant logcat entries. Copy and paste the following to your terminal shell:
@@ -121,28 +105,22 @@ alias aimrun='cdaim; logclr; am start -n com.SecUpwN.AIMSICD/.AIMSICD; read dumm
 To run it, just type: `aimrun`.
 If you want to also supply *radio* logcat, add `-b radio` somewhere in the `logdmp` alias, but know that your GPS location and cell info may be included when you do that.
 
----
-
-#### SEEKING
+## SEEKING
 
 Special positions we are currently seeking skilled people for:
 
 * People with a CryptoPhone for another detection verification.
 * Bugfixer for [Coverity Scan Defects](https://scan.coverity.com/projects/3346) detected within our app.
 
----
-
-#### DONATING
+## DONATING
 
 Thank you for encouraging our developers!
 
 * Feel invited to donate using [this guide](https://github.com/CellularPrivacy/Android-IMSI-Catcher-Detector/wiki/Donations).
 
----
-
-#### Code of Conduct
+## Code of Conduct
 
-**Our Pledge**
+### Our Pledge
 
 In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to making participation in our project and
@@ -151,7 +129,7 @@ size, disability, ethnicity, gender identity and expression, level of experience
 nationality, personal appearance, race, religion, or sexual identity and
 orientation.
 
-**Our Standards**
+### Our Standards
 
 Examples of behavior that contributes to creating a positive environment
 include:
@@ -173,7 +151,7 @@ advances
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-**Our Responsibilities**
+### Our Responsibilities
 
 Project maintainers are responsible for clarifying the standards of acceptable
 behavior and are expected to take appropriate and fair corrective action in
@@ -185,7 +163,7 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
-**Scope**
+### Scope
 
 This Code of Conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community. Examples of
@@ -194,7 +172,7 @@ address, posting via an official social media account, or acting as an appointed
 representative at an online or offline event. Representation of a project may be
 further defined and clarified by project maintainers.
 
-**Enforcement**
+### Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by contacting the [project maintainer](https://github.com/SecUpwN). All
@@ -207,6 +185,6 @@ Project maintainers who do not follow or enforce the Code of Conduct in good
 faith may face temporary or permanent repercussions as determined by other
 members of the project's leadership.
 
-**Attribution**
+### Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), Version 1.4
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,35 +1,24 @@
->Thank you for your feedback! Please add below details so that we can help you a bit faster.
+<!-- Thank you for your feedback! Please add below details so that we can help you a bit faster. -->
 
----
-
-#### Agreements
->Please check these boxes to ensure you've actually read and understood these important rules!
+### Agreements
+<!-- Please check these boxes to ensure you've actually read and understood these important rules! -->
 
 - [ ] **I have reviewed and accepted the [guidelines for contributing](https://github.com/CellularPrivacy/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md) to this project.**
 - [ ] **I have searched the [open Issues](https://github.com/CellularPrivacy/Android-IMSI-Catcher-Detector/issues) and made sure I am not filing a duplicate.**
 - [ ] **I have read the notes on [debugging](https://github.com/CellularPrivacy/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#debugging) and will properly maintain this Issue.**
 
-
----
-
-#### Overview
->Please add a short and easy to understand description of the Issue you've experienced here.
+### Overview
+<!-- Please add a short and easy to understand description of the Issue you've experienced here. -->
 
 * `AIMSICD` version (see the `About` screen):
 * Phone and ROM running *current* release:
 * Link to logfile without identifyable data:
 
----
-
-#### Reproduction
->Please tell us the detailed steps on how to reproduce your Issue here.
-
----
-
-#### References
->If your Issue is related to any other existing Issues or pull requests, please link them here.
+### Reproduction
+<!-- Please tell us the detailed steps on how to reproduce your Issue here. -->
 
----
+### References
+<!-- If your Issue is related to any other existing Issues or pull requests, please link them here. -->
 
-#### Screenshots
->If you experienced visual glitches, please add a screenshot without metadata here.
+### Screenshots
+<!-- If you experienced visual glitches, please add a screenshot without metadata here. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,34 +1,24 @@
->Thank you for submitting a pull request! Please add below details so that we can merge it faster.
+<!-- Thank you for submitting a pull request! Please add below details so that we can merge it faster. -->
 
----
-
-#### Agreements
->Please check these boxes to ensure you've actually read and understood these important rules!
+### Agreements
+<!-- Please check these boxes to ensure you've actually read and understood these important rules! -->
 
 - [ ] **I have reviewed and accepted the [guidelines for contributing](https://github.com/CellularPrivacy/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md) to this project.**
 - [ ] **I have reviewed and closely followed the [Style Guide](https://github.com/CellularPrivacy/Android-IMSI-Catcher-Detector/wiki/Style-Guide) for this Android app.**
 
----
-
-#### Overview
->Please add a short and easy to understand description of your proposed changes here.
-
----
+### Overview
+<!-- Please add a short and easy to understand description of your proposed changes here. -->
 
-#### Classification
->Please click the correct checkbox that applies best to classify your pull request.
+### Classification
+<!-- Please click the correct checkbox that applies best to classify your pull request. -->
 
 - [ ] Bugfix (non-breaking change which fixes an existing issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Refactor (restructuring of existing code without changing its external functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
 
----
-
-#### References
->If your pull request is related to or solves any existing Issues, please link them here.
-
----
+### References
+<!-- If your pull request is related to or solves any existing Issues, please link them here. -->
 
-#### Screenshots
->If you have created visual changes, please add a screenshot without metadata here.
+### Screenshots
+<!-- If you have created visual changes, please add a screenshot without metadata here. -->
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml
diff --git a/.travis.yml b/.travis.yml
@@ -5,31 +5,36 @@
 # ------------------------------------------------------------------------
 
 language: android
-sudo: false
-
 jdk: oraclejdk8
+sudo: false
 
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+    - $HOME/.android/build-cache
 
 env:
   global:
+    - GRADLE_OPTS="-Xmx2048m -Xms512m"
     # Encrypted Coverity Scan Token
     - secure: "jRKgZfeAxDhqDIrySBESiij3Ot9cmVQ4CMB+IVpmf7Xjfek6By1ba7Y1lgMdLRPgvLkj3k5mMx1BMx2yeSCBp/+TZJ6Ezj3EVJ6HS2ctkAH4KzsiqlSCKiRgfOqKgzfnftCkNzXCEE3XLVLcv4iT5Ru/EBG85kEDViGrDBP+PxA="
 
 android:
   components:
-    - platform-tools
     - tools
-    - build-tools-23.0.3
-    - android-23
+    - platform-tools
+    - build-tools-25.0.2
+    - android-25
     - extra-android-m2repository
 
-before_install: 'openssl aes-256-cbc -K $encrypted_dc771c3300d2_key -iv $encrypted_dc771c3300d2_iv -in keystore.jks.enc -out keystore.jks -d || true'
+before_install:
+  - 'openssl aes-256-cbc -K $encrypted_dc771c3300d2_key -iv $encrypted_dc771c3300d2_iv -in keystore.jks.enc -out keystore.jks -d || true'
+
+install: ./gradlew clean
 
 script: ./gradlew build check
 
@@ -61,3 +66,9 @@ addons:
 notifications:
   hipchat:
     - secure: "I2XmQkFCyKZHW2NeClYyl3FND80YkqLtYo+Rn3ftS4xjEg6VfGgDv6AlvQ+b+oZg7RZI6nKia9OLZxAxVBOHw6UcJJnurJx4hfAIBZAihIiNpZPj1c9wGgv4D+M6zi3rgbJRZ2Tz6IKJvHC+CD3LApeJR9kH15lDWbD7YZ0UI7E="
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/4c8e31d5ac5b12001ca4
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: never     # options: [always|never|change] default: always