Skip to content

Commit acc45c7

Browse files
SecUpwNSecUpwN
committed
Merge pull request #736 from SecUpwN/development
Unchaining WIP-Release v0.1.38-alpha
2 parents bf2cd64 + ff637ce commit acc45c7

101 files changed

Lines changed: 1594 additions & 5376 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ android:
3030
- platform-tools
3131
- tools
3232
# The BuildTools version we are using for our project
33-
- build-tools-22.0.1
34-
- android-22
33+
- build-tools-23.0.2
34+
- android-23
3535
# Additional components
3636
- extra-android-m2repository
3737

‎AIMSICD/build.gradle‎

Lines changed: 52 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
apply plugin: 'checkstyle'
12
apply plugin: 'com.android.application'
23

3-
def gitSha = 'na'
4+
def gitSha = null
45
try {
56
gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()
67
} catch (Exception e) {
7-
logger.warn("git not available")
8+
logger.warn("git not available", e)
89
}
910

1011
def isCi = "true".equals(System.getenv("CI"))
@@ -17,18 +18,19 @@ if(isTravis) {
1718
buildNumber = System.getenv("BUILDOZER_BUILDNUMBER")
1819
}
1920

21+
version = '0.1.38-alpha'
2022

2123
android {
22-
compileSdkVersion 22
23-
buildToolsVersion '22.0.1'
24+
compileSdkVersion 23
25+
buildToolsVersion '23.0.2'
2426
defaultConfig {
2527
minSdkVersion 16
2628
targetSdkVersion 19 // Do not change: Working Icons on Android 5+
27-
versionCode 37
28-
versionName '0.1.37-alpha'
29+
versionCode 38
2930
testApplicationId "com.SecUpwN.AIMSICD.test"
3031

3132
buildConfigField 'String', 'BUILD_NUMBER', (buildNumber == null ? 'null' : "\"${buildNumber}\"")
33+
buildConfigField 'String', 'GIT_SHA', (gitSha == null ? 'null' : "\"${gitSha}\"")
3234
}
3335
buildTypes {
3436
debug {
@@ -37,18 +39,12 @@ android {
3739
} catch (MissingPropertyException e) {
3840
buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"'
3941
}
40-
if (!gitSha.equals('na')) {
41-
versionNameSuffix '-' + gitSha
42-
} else {
43-
versionNameSuffix '-debug'
44-
}
42+
versionNameSuffix '-debug'
4543
}
4644
release {
4745
buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"'
4846
minifyEnabled true
4947
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
50-
51-
versionNameSuffix '-release'
5248
}
5349
}
5450
compileOptions {
@@ -71,26 +67,55 @@ android {
7167
}
7268

7369
productFlavors {
74-
system {}
75-
normal {}
70+
system {
71+
versionName "$project.version-system"
72+
}
73+
normal {
74+
versionName "$project.version-normal"
75+
}
7676
}
7777
}
7878

7979
dependencies {
8080
// DO NOT REMOVE BELOW COMMENTED-OUT CODE BEFORE ASKING!
81-
//compile 'com.github.amlcurran.showcaseview:library:5.0.0'
82-
compile 'com.android.support:appcompat-v7:22.2.1'
83-
//https://github.com/lp0/slf4j-android
84-
compile project(':third_party:rootshell')
85-
compile 'org.slf4j:slf4j-api:1.7.12'
86-
compile 'eu.lp0.slf4j:slf4j-android:1.7.12-0'
87-
compile 'com.squareup.okhttp:okhttp:2.6.0'
81+
// Please group dependencies for better review like below.
82+
83+
// Android Support Libraries
84+
compile 'com.android.support:appcompat-v7:23.1.1'
85+
86+
// OpenCSV (comma-separated values) parser library
8887
compile 'au.com.bytecode:opencsv:2.4'
88+
89+
// Easy to use Root Shell for Android Applications
90+
compile 'com.github.Stericson:RootShell:d708ae1f0a'
91+
92+
// SLF4J binding for the Android logger
93+
// https://github.com/lp0/slf4j-android
94+
compile 'eu.lp0.slf4j:slf4j-android:1.7.12-0'
95+
compile 'org.slf4j:slf4j-api:1.7.12'
96+
97+
// Dependency Injection for Android
98+
compile 'io.freefair.android-injection:injection:1.0.0-rc2'
99+
compile 'io.freefair.android-injection:logging:1.0.0-rc2'
100+
compile 'io.freefair.android-injection:okhttp:1.0.0-rc2'
89101

90-
//This git hash resolves to version 5.5
91-
compile 'com.github.MKergall.osmbonuspack:OSMBonusPack:2e8bca20f7'
102+
// OSMBonusPack library to interact with OpenStreetMap data
103+
compile 'com.github.MKergall.osmbonuspack:OSMBonusPack:v5.6'
104+
105+
// Transition library for animated transition effects
92106
compile 'com.github.kaichunlin.transition:core:0.9.2'
93-
compile 'io.freefair.android-util:logging:1.1.0'
94-
//debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
95-
//releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
107+
108+
// ShowcaseView library to highlight specific app elements
109+
//compile 'com.github.amlcurran.showcaseview:library:5.3.0'
110+
}
111+
112+
check.dependsOn 'checkstyle'
113+
114+
task checkstyle(type: Checkstyle) {
115+
source 'src'
116+
include '**/*.java'
117+
118+
119+
120+
classpath = files()
96121
}

‎AIMSICD/config/checkstyle/checkstyle.xml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE module PUBLIC
3+
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4+
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
5+
6+
<module name="Checker">
7+
<!--module name="NewlineAtEndOfFile"/-->
8+
<module name="FileLength">
9+
<property name="max" value="2500"/>
10+
</module>
11+
<!--module name="FileTabCharacter"/-->
12+
13+
<module name="TreeWalker">
14+
15+
<!--module name="ConstantName"/>
16+
<module name="LocalFinalVariableName"/>
17+
<module name="LocalVariableName"/>
18+
<module name="MemberName"/>
19+
<module name="MethodName"/>
20+
<module name="ParameterName"/>
21+
<module name="StaticVariableName"/>
22+
<module name="TypeName"/-->
23+
24+
25+
<!-- Checks for imports -->
26+
<!-- See http://checkstyle.sf.net/config_import.html -->
27+
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
28+
<module name="RedundantImport"/>
29+
<module name="UnusedImports">
30+
<property name="processJavadoc" value="true"/>
31+
</module>
32+
33+
<!-- Modifier Checks -->
34+
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
35+
<module name="ModifierOrder"/>
36+
<module name="RedundantModifier"/>
37+
38+
<module name="CovariantEquals"/>
39+
<module name="EmptyStatement"/>
40+
41+
42+
<module name="IllegalInstantiation"/>
43+
44+
<!--module name="MissingSwitchDefault"/-->
45+
<!--module name="RedundantThrows"/-->
46+
<module name="SimplifyBooleanExpression"/>
47+
<module name="SimplifyBooleanReturn"/>
48+
</module>
49+
</module>

‎AIMSICD/proguard-rules.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
-dontobfuscate
12
-verbose
23
-optimizationpasses 5
34
-dontpreverify
45
-dump class_files.txt
56
-printseeds seeds.txt
67
-printusage unused.txt
7-
-printmapping mapping.txt
88

99
-keepattributes *Annotation*
1010
-keepattributes SourceFile,LineNumberTable

‎AIMSICD/src/androidTest/java/com/SecUpwN/AIMSICD/test/Detection1.java‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎AIMSICD/src/main/AndroidManifest.xml‎

Lines changed: 29 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,38 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
23
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
34
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.SecUpwN.AIMSICD">
5-
6-
<!-- If we ever wanna make this a system app, we can add the following 2 lines above:
7-
coreApp="true"
8-
android:sharedUserId="android.uid.system"> -->
5+
package="com.SecUpwN.AIMSICD"
6+
tools:ignore="GoogleAppIndexingWarning">
97

10-
<!-- PERMISSIONS ARE SORTED BY AOS PERMISSION AND 3rd PARTY ACCESS. KEEP THIS! -->
11-
<!-- https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Permissions -->
8+
<!--
9+
Privacy Enthusiasts: Please read our Permissions Statement linked below!
10+
https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Permissions
11+
-->
1212

13-
<!-- Normal Android third-party permissions -->
14-
<uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
13+
<!-- Normal Android third-party permissions, sorted for better viewing -->
1514
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
1615
<uses-permission android:name="android.permission.ACCESS_COARSE_UPDATES"/>
1716
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
1817
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
18+
<uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
1919
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
20+
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
2021
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
2122
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
22-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
23-
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
23+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
2424
<uses-permission android:name="android.permission.VIBRATE"/>
2525
<uses-permission android:name="android.permission.WAKE_LOCK"/>
26+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
27+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
2628

2729
<!-- SPECIAL PERMISSIONS TO BE ADDED AFTER THIS LINE. /> -->
28-
<!-- To list all available (used) Android permissions on a device, use:
29-
# `pm list permissions -g` -->
30-
31-
<!-- These are OEM / Samsung Permissions -->
32-
<uses-permission android:name="android.phone.receiveDetailedCallState"/>
33-
<uses-permission android:name="com.android.permission.HANDOVER_STATUS"/>
34-
<uses-permission android:name="com.sec.android.app.controlpanel.permission.PRIVATE"/>
35-
<uses-permission android:name="com.sec.android.app.factorymode.permission.KEYSTRING"/>
36-
<uses-permission android:name="com.sec.android.app.cm.permission.PERMISSION_MANAGEMENT"/>
37-
<uses-permission android:name="com.sec.android.app.phoneutil.permission.KEYSTRING"/>
38-
<uses-permission android:name="com.sec.android.app.servicemodeapp.permission.KEYSTRING"/>
39-
<uses-permission android:name="com.sec.android.phone.permission.DATA_ROAMING_SETTINGS_ENHANCED"/>
40-
<uses-permission android:name="com.sec.android.phone.permission.READ_CALL_SETTINGS"/>
41-
<uses-permission android:name="com.sec.android.phone.permission.WRITE_CALL_SETTINGS"/>
42-
<!-- uses-permission android:name="com.sec.factory.permission.ALLOWFTCLIENTCPOBIND"/>
43-
<uses-permission android:name="com.sec.factory.permission.BT_ID_WRITE"/ -->
44-
<uses-permission android:name="com.sec.factory.permission.KEYSTRING"/>
45-
<uses-permission android:name="com.sec.modem.settings.permission.KEYSTRING"/>
46-
<!-- uses-permission android:name="diagandroid.app.receiveDetailedApplicationState"/>
47-
<uses-permission android:name="diagandroid.data.receivePDPContextState"/>
48-
<uses-permission android:name="diagandroid.phone.receiveDetailedCallState"/ -->
49-
50-
<!-- May be needed (in the future) to access SIM related functions -->
51-
<uses-permission android:name="org.simalliance.openmobileapi.SMARTCARD"/>
52-
30+
31+
<!--
32+
May be needed (in the future) to access SIM related functions
33+
<uses-permission android:name="org.simalliance.openmobileapi.SMARTCARD"/>
34+
-->
35+
5336
<application
5437
tools:replace="allowBackup"
5538
android:allowBackup="false"
@@ -100,11 +83,20 @@
10083
android:name=".activities.OpenCellIdActivity"
10184
android:icon="@drawable/ic_action_settings"
10285
android:label="@string/title_ocid_key"
103-
android:theme="@android:style/Theme.Holo.Dialog"
10486
android:parentActivityName=".activities.PrefActivity"
10587
android:configChanges="keyboardHidden|screenLayout|screenSize|orientation">
10688
</activity>
10789

90+
<activity
91+
android:name=".activities.AboutActivity"
92+
android:label="@string/about_aimsicd"
93+
android:parentActivityName=".AIMSICD">
94+
<intent-filter>
95+
<action android:name="android.intent.action.VIEW"/>
96+
<category android:name="android.intent.category.INFO"/>
97+
</intent-filter>
98+
</activity>
99+
108100
<activity
109101
android:name=".activities.DebugLogs"
110102
android:icon="@drawable/ic_action_settings"
@@ -137,10 +129,6 @@
137129
</intent-filter>
138130
</receiver>
139131

140-
<activity android:name=".activities.CreditsRollActivity"
141-
android:theme="@android:style/Theme.Dialog"
142-
android:screenOrientation="portrait"> </activity>
143-
144132
<activity
145133
android:name=".smsdetection.AdvancedUserActivity"
146134
android:label="@string/title_activity_advanced_user" >

‎AIMSICD/src/main/assets/CREDITS‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
1-
### .:: C R E D I T S ::. ###\n
2-
\n
3-
of the\n
4-
\n
51
ANDROID IMSI-CATCHER DETECTOR\n
62
[born in 2012 on XDA-Developers]\n
7-
https://is.gd/AIMSICD\n
8-
\n
9-
~*********************~\n
3+
Website: https://git.io/AIMSICD\n
104
\n
115
This list is in no particular order.\n
126
If I forgot YOU, please drop me a hint.\n
137
\n
148
THANK YOU EVERYONE! ;-)\n
159
\n
16-
~*********************~\n
17-
\n
1810
E:V:A\n
1911
for creating this AWESOME project! <3\n
2012
unfortunately he left this project.\n

0 commit comments

Comments
 (0)