Merge pull request #815 from SecUpwN/development

Unchaining WIP-Release v0.1.41-alpha

Author: SecUpwN

CONTRIBUTING.md .github/CONTRIBUTING.mdCONTRIBUTING.md renamed to .github/CONTRIBUTING.md

@@ -3,14 +3,14 @@
 
 Thank you for contributing! Please select:
 
-* [Developing](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/CONTRIBUTING.md#developing)
-* [Translating](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/CONTRIBUTING.md#translating)
-* [Testing](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/CONTRIBUTING.md#testing)
-* [Formatting](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/CONTRIBUTING.md#formatting)
-* [Debugging](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/CONTRIBUTING.md#debugging)
-* [Seeking](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/CONTRIBUTING.md#seeking)
-* [Donating](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/CONTRIBUTING.md#donating)
-* [Respecting](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/CONTRIBUTING.md#code-of-conduct)
+* [Developing](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#developing)
+* [Translating](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#translating)
+* [Testing](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#testing)
+* [Formatting](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#formatting)
+* [Debugging](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#debugging)
+* [Seeking](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#seeking)
+* [Donating](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#donating)
+* [Respecting](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md#code-of-conduct)
 
 ---
 
@@ -142,23 +142,71 @@ Thank you for encouraging our developers!
 
 #### Code of Conduct
 
-As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+**Our Pledge**
 
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+**Our Standards**
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery  
-* Personal attacks  
-* Trolling or insulting/derogatory comments  
-* Public or private harassment  
-* Publishing other's private information, such as physical or electronic addresses, without explicit permission  
-* Other unethical or unprofessional conduct  
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+**Our Responsibilities**
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+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**
+
+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
+representing a project or community include using an official project e-mail
+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**
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions 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.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the [project maintainer.](https://github.com/SecUpwN) All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
 
-By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+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.
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+**Attribution**
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting our [project maintainer](https://github.com/SecUpwN). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident. This Code of Conduct is adapted from the [Contributor Covenant](https://github.com/ContributorCovenant/contributor_covenant).
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), Version 1.4

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,35 @@
+>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!
+
+- [ ] **I have reviewed and accepted the [guidelines for contributing](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md) to this project.**
+- [ ] **I have searched the [open Issues](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/issues) and made sure I am not filing a duplicate.**
+- [ ] **I have read the notes on [debugging](https://github.com/SecUpwN/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.
+
+* `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.
+
+---
+
+#### Screenshots
+>If you experienced visual glitches, please add a screenshot without metadata here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,33 @@
+>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!
+
+- [ ] **I have reviewed and accepted the [guidelines for contributing](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/development/.github/CONTRIBUTING.md) to this project.**
+- [ ] **I have reviewed and closely followed the [Style Guide](https://github.com/SecUpwN/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.
+
+---
+
+#### 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)
+- [ ] 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.
+
+---
+
+#### Screenshots
+>If you have created visual changes, please add a screenshot without metadata here.

.travis.yml

@@ -5,52 +5,32 @@
 # https://rkh.github.io/travis-encrypt/public/index.html
 # ---------------------------------------------------------------
 
-# Travis CI Settings
-#-------------------
-
 language: android
-# Turning off caching to avoid caching Issues
-cache: false
-# Using the new Container-Based Infrastructure
 sudo: false
+
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+before_cache:
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+
 env:
   global:
-# Encrypted Tokens
-#-----------------
-
-# Encrypted Coverity Scan Token
+    # Encrypted Coverity Scan Token
     - secure: "jRKgZfeAxDhqDIrySBESiij3Ot9cmVQ4CMB+IVpmf7Xjfek6By1ba7Y1lgMdLRPgvLkj3k5mMx1BMx2yeSCBp/+TZJ6Ezj3EVJ6HS2ctkAH4KzsiqlSCKiRgfOqKgzfnftCkNzXCEE3XLVLcv4iT5Ru/EBG85kEDViGrDBP+PxA="
-# Encrypted internal chat Token
-notifications:
-  hipchat:
-    - secure: "I2XmQkFCyKZHW2NeClYyl3FND80YkqLtYo+Rn3ftS4xjEg6VfGgDv6AlvQ+b+oZg7RZI6nKia9OLZxAxVBOHw6UcJJnurJx4hfAIBZAihIiNpZPj1c9wGgv4D+M6zi3rgbJRZ2Tz6IKJvHC+CD3LApeJR9kH15lDWbD7YZ0UI7E="
+
 android:
   components:
-# We are using the latest revision of Android SDK Tools
-     - platform-tools
-     - tools
-# The BuildTools version we are using for our project
-     - build-tools-23.0.2
-     - android-23
-# Additional components
-     - extra-android-m2repository
+    - platform-tools
+    - tools
+    - build-tools-23.0.2
+    - android-23
+    - 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'
 
-
 script: ./gradlew build check
-# Coverity Scan Settings
-#-----------------------
-
-addons:
-  coverity_scan:
-    project:
-      name: "SecUpwN/Android-IMSI-Catcher-Detector"
-    notification_email: annoyed@coverity.notifications
-# Scan results: http://scan.coverity.com/projects/3346
-    build_command_prepend: "./gradlew clean"
-    build_command: "./gradlew build"
-    branch_pattern: master
 
 before_deploy:
   - cd AIMSICD/build/outputs/apk; ls -la; md5sum *-normal-release.apk > md5sum.txt; sha1sum *-normal-release.apk > sha1sum.txt; cd -
@@ -67,3 +47,16 @@ deploy:
   on:
     repo: SecUpwN/Android-IMSI-Catcher-Detector
     tags: true
+
+addons:
+  coverity_scan: #Scan results: http://scan.coverity.com/projects/3346
+    project:
+      name: "SecUpwN/Android-IMSI-Catcher-Detector"
+    notification_email: annoyed@coverity.notifications
+    build_command_prepend: "./gradlew clean"
+    build_command: "./gradlew build"
+    branch_pattern: master
+
+notifications:
+  hipchat:
+    - secure: "I2XmQkFCyKZHW2NeClYyl3FND80YkqLtYo+Rn3ftS4xjEg6VfGgDv6AlvQ+b+oZg7RZI6nKia9OLZxAxVBOHw6UcJJnurJx4hfAIBZAihIiNpZPj1c9wGgv4D+M6zi3rgbJRZ2Tz6IKJvHC+CD3LApeJR9kH15lDWbD7YZ0UI7E="

AIMSICD/build.gradle

@@ -14,9 +14,10 @@ android {
     buildToolsVersion '23.0.2'
 
     defaultConfig {
+        applicationId "com.SecUpwN.AIMSICD"
         minSdkVersion 16
         targetSdkVersion 19 // Do not change: Working Icons on Android 5+
-        versionCode 40
+        versionCode 41
         testApplicationId "com.SecUpwN.AIMSICD.test"
 
         buildConfigField 'String', 'BUILD_NUMBER', (getBuildNumber() == null ? 'null' : "\"${buildNumber}\"")
@@ -79,9 +80,9 @@ dependencies {
     compile 'com.github.Stericson:RootShell:d708ae1f0a'
 
     // Dependency Injection for Android
-    compile 'io.freefair.android-injection:injection:1.0.0-rc2'
-    compile 'io.freefair.android-injection:logging:1.0.0-rc2'
-    compile 'io.freefair.android-injection:okhttp:1.0.0-rc2'
+    compile 'io.freefair.android-injection:injection:2.0.0-beta1'
+    compile 'io.freefair.android-injection:logging:2.0.0-beta1'
+    compile 'io.freefair.android-injection:okhttp:2.0.0-beta1'
 
     // OSMBonusPack library to interact with OpenStreetMap data
     compile 'com.github.MKergall.osmbonuspack:OSMBonusPack:v5.6'
@@ -112,4 +113,4 @@ String getBuildNumber() {
     }
 
     return null;
-}
+}

AIMSICD/config/checkstyle/checkstyle.xml

@@ -11,19 +11,22 @@
 
     <!-- Name Checks -->
     <module name="TreeWalker">
-        <property name="severity" value="info" />
 
-        <module name="ConstantName" />
-        <module name="LocalFinalVariableName" />
-        <module name="LocalVariableName" />
-        <module name="MemberName" />
-        <module name="MethodName" />
-        <module name="ParameterName" />
-        <module name="StaticVariableName" />
-        <module name="TypeName" />
+        <!--module name="ConstantName" /-->
+        <!--module name="LocalFinalVariableName" /-->
+        <!--module name="LocalVariableName" /-->
+        <!--module name="MemberName" /-->
+        <!--module name="MethodName" /-->
+        <!--module name="ParameterName" /-->
+        <!--module name="StaticVariableName" /-->
+        <!--module name="TypeName" /-->
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$" />
+        </module>
     </module>
     <module name="TreeWalker">
 
+
         <!-- Checks for imports                              -->
         <!-- See http://checkstyle.sf.net/config_import.html -->
         <module name="AvoidStarImport" />
@@ -77,5 +80,14 @@
         <module name="MethodParamPad" />
         <module name="NoLineWrap" />
         <module name="NoWhitespaceAfter" />
+        <module name="NoWhitespaceBefore" />
+        <module name="ParenPad" />
+        <module name="SeparatorWrap">
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="TypecastParenPad" />
+        <module name="WhitespaceAfter" />
+        <module name="WhitespaceAround" />
     </module>
 </module>

…va/com/SecUpwN/AIMSICD/test/GetProp.java …va/com/secupwn/aimsicd/test/GetProp.javaAIMSICD/src/androidTest/java/com/SecUpwN/AIMSICD/test/GetProp.java renamed to AIMSICD/src/androidTest/java/com/secupwn/aimsicd/test/GetProp.java AIMSICD/src/androidTest/java/com/SecUpwN/AIMSICD/test/GetProp.java renamed to AIMSICD/src/androidTest/java/com/secupwn/aimsicd/test/GetProp.java

@@ -3,12 +3,12 @@
  * LICENSE:  http://git.io/vki47 | TERMS:  http://git.io/vki4o
  * -----------------------------------------------------------
  */
-package com.SecUpwN.AIMSICD.test;
+package com.secupwn.aimsicd.test;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 
-import com.SecUpwN.AIMSICD.activities.DebugLogs;
+import com.secupwn.aimsicd.activities.DebugLogs;
 
 import java.io.IOException;
 
@@ -23,9 +23,12 @@ public GetProp() {
 
     public void testGetPropsReturnsValue() throws IOException {
         DebugLogs activity = (DebugLogs) getActivity();
-        try { Thread.sleep(1000); } catch (Exception e) {}
+        try {
+            Thread.sleep(1000);
+        } catch (Exception e) {
+        }
         String props = activity.getProp();
         Log.d("getprop", props);
         assertTrue(props.trim().length() > 0);
     }
-}
+}

AIMSICD/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.SecUpwN.AIMSICD"
+    package="com.secupwn.aimsicd"
     tools:ignore="GoogleAppIndexingWarning">
 
     <!--