Skip to content

Commit bf2cd64

Browse files
SecUpwNSecUpwN
committed
Merge pull request #687 from SecUpwN/development
Unchaining WIP-Release v0.1.37-alpha
2 parents 93b4247 + 9669279 commit bf2cd64

388 files changed

Lines changed: 2931 additions & 2979 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: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ cache: false
1515
sudo: false
1616
env:
1717
global:
18-
# Initiating clean Gradle output
19-
- TERM=dumb
20-
# Amount of memory granted to Gradle JVM
21-
- GRADLE_OPTS="-Xmx512m -XX:MaxPermSize=512m"
22-
# General Android settings used in builds
23-
- ANDROID_TARGET=android-17
24-
- ANDROID_ABI=armeabi-v7a
25-
2618
# Encrypted Tokens
2719
#-----------------
2820

@@ -32,39 +24,18 @@ env:
3224
notifications:
3325
hipchat:
3426
- secure: "I2XmQkFCyKZHW2NeClYyl3FND80YkqLtYo+Rn3ftS4xjEg6VfGgDv6AlvQ+b+oZg7RZI6nKia9OLZxAxVBOHw6UcJJnurJx4hfAIBZAihIiNpZPj1c9wGgv4D+M6zi3rgbJRZ2Tz6IKJvHC+CD3LApeJR9kH15lDWbD7YZ0UI7E="
35-
36-
before_install:
37-
# Making sure gradlew has executable permissions
38-
- chmod +x gradlew
39-
4027
android:
4128
components:
4229
# We are using the latest revision of Android SDK Tools
4330
- platform-tools
4431
- tools
4532
# The BuildTools version we are using for our project
46-
- build-tools-21.1.2
47-
# System Image we use to run emulator(s) during tests
48-
- sys-img-armeabi-v7a-android-17
33+
- build-tools-22.0.1
34+
- android-22
4935
# Additional components
5036
- extra-android-m2repository
51-
52-
licenses:
53-
- 'android-sdk-license-.+'
54-
55-
# Emulator Management: Create, Start and Wait
56-
before_script:
57-
# Inspecting running services
58-
- ps auxww
59-
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
60-
- emulator -avd test -no-skin -no-audio -no-window &
61-
- android-wait-for-emulator
62-
- adb shell input keyevent 82 &
6337

64-
script:
65-
- ./gradlew connectedAndroidTest --info
66-
- ./gradlew lintVitalRelease
67-
38+
script: ./gradlew build check
6839
# Coverity Scan Settings
6940
#-----------------------
7041

app/.gitignore renamed to AIMSICD/.gitignore

File renamed without changes.

‎AIMSICD/build.gradle‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
apply plugin: 'com.android.application'
2+
3+
def gitSha = 'na'
4+
try {
5+
gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()
6+
} catch (Exception e) {
7+
logger.warn("git not available")
8+
}
9+
10+
def isCi = "true".equals(System.getenv("CI"))
11+
def isTravis = "true".equals(System.getenv("TRAVIS"))
12+
13+
def buildNumber = null
14+
if(isTravis) {
15+
buildNumber = System.getenv("TRAVIS_BUILD_NUMBER")
16+
} else {
17+
buildNumber = System.getenv("BUILDOZER_BUILDNUMBER")
18+
}
19+
20+
21+
android {
22+
compileSdkVersion 22
23+
buildToolsVersion '22.0.1'
24+
defaultConfig {
25+
minSdkVersion 16
26+
targetSdkVersion 19 // Do not change: Working Icons on Android 5+
27+
versionCode 37
28+
versionName '0.1.37-alpha'
29+
testApplicationId "com.SecUpwN.AIMSICD.test"
30+
31+
buildConfigField 'String', 'BUILD_NUMBER', (buildNumber == null ? 'null' : "\"${buildNumber}\"")
32+
}
33+
buildTypes {
34+
debug {
35+
try {
36+
buildConfigField 'String', 'OPEN_CELLID_API_KEY', '\"' + open_cellid_api_key + '\"'
37+
} catch (MissingPropertyException e) {
38+
buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"'
39+
}
40+
if (!gitSha.equals('na')) {
41+
versionNameSuffix '-' + gitSha
42+
} else {
43+
versionNameSuffix '-debug'
44+
}
45+
}
46+
release {
47+
buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"'
48+
minifyEnabled true
49+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
50+
51+
versionNameSuffix '-release'
52+
}
53+
}
54+
compileOptions {
55+
sourceCompatibility JavaVersion.VERSION_1_7
56+
targetCompatibility JavaVersion.VERSION_1_7
57+
}
58+
lintOptions {
59+
warning 'MissingTranslation', 'InvalidPackage'
60+
abortOnError false
61+
62+
xmlReport false
63+
htmlReport !isCi
64+
65+
textReport isCi
66+
textOutput 'stdout'
67+
}
68+
packagingOptions {
69+
exclude 'META-INF/NOTICE.txt'
70+
exclude 'META-INF/LICENSE.txt'
71+
}
72+
73+
productFlavors {
74+
system {}
75+
normal {}
76+
}
77+
}
78+
79+
dependencies {
80+
// 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'
88+
compile 'au.com.bytecode:opencsv:2.4'
89+
90+
//This git hash resolves to version 5.5
91+
compile 'com.github.MKergall.osmbonuspack:OSMBonusPack:2e8bca20f7'
92+
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'
96+
}

‎AIMSICD/proguard-rules.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-verbose
2+
-optimizationpasses 5
3+
-dontpreverify
4+
-dump class_files.txt
5+
-printseeds seeds.txt
6+
-printusage unused.txt
7+
-printmapping mapping.txt
8+
9+
-keepattributes *Annotation*
10+
-keepattributes SourceFile,LineNumberTable
11+
12+
-dontwarn java.beans.**
13+
14+
-dontwarn org.apache.**
15+
-dontwarn okio.**
16+
17+
-keep class com.kaichunlin.transition.** { *; }
18+
-dontwarn com.kaichunlin.transition.**

app/src/androidTest/java/com/SecUpwN/AIMSICD/test/Detection1.java renamed to AIMSICD/src/androidTest/java/com/SecUpwN/AIMSICD/test/Detection1.java

File renamed without changes.

app/src/androidTest/java/com/SecUpwN/AIMSICD/test/GetProp.java renamed to AIMSICD/src/androidTest/java/com/SecUpwN/AIMSICD/test/GetProp.java

File renamed without changes.

app/src/main/AndroidManifest.xml renamed to AIMSICD/src/main/AndroidManifest.xml

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.SecUpwN.AIMSICD"
5-
android:versionCode="36"
6-
android:versionName="0.1.36-alpha-b00">
3+
xmlns:tools="http://schemas.android.com/tools"
4+
package="com.SecUpwN.AIMSICD">
75

86
<!-- If we ever wanna make this a system app, we can add the following 2 lines above:
97
coreApp="true"
@@ -17,58 +15,19 @@
1715
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
1816
<uses-permission android:name="android.permission.ACCESS_COARSE_UPDATES"/>
1917
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
20-
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
2118
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
22-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
2319
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
24-
<uses-permission android:name="android.permission.INTERNET"/>
2520
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
2621
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
27-
<uses-permission android:name="android.permission.READ_LOGS"/>
28-
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
29-
<uses-permission android:name="android.permission.RECEIVE_SMS"/>
30-
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
3122
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
32-
33-
<!-- NEW -->
3423
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
35-
<uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED"/>
36-
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
37-
<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
38-
<uses-permission android:name="android.permission.NFC"/>
39-
<uses-permission android:name="android.permission.READ_CONTACTS"/>
40-
<uses-permission android:name="android.permission.READ_SMS"/>
41-
<uses-permission android:name="android.permission.RECEIVE_MMS"/>
42-
<uses-permission android:name="android.permission.RECEIVE_WAP_PUSH"/>
43-
<uses-permission android:name="android.permission.USE_SIP"/>
4424
<uses-permission android:name="android.permission.VIBRATE"/>
4525
<uses-permission android:name="android.permission.WAKE_LOCK"/>
46-
<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
4726

4827
<!-- SPECIAL PERMISSIONS TO BE ADDED AFTER THIS LINE. /> -->
4928
<!-- To list all available (used) Android permissions on a device, use:
5029
# `pm list permissions -g` -->
5130

52-
<!-- These are Android System (non 3rd party) Permissions -->
53-
<uses-permission android:name="android.permission.CONTROL_LOCATION_UPDATES"/>
54-
<uses-permission android:name="android.permission.DEVICE_POWER"/>
55-
<uses-permission android:name="android.permission.DIAGNOSTIC"/>
56-
<uses-permission android:name="android.permission.DUMP"/>
57-
<uses-permission android:name="android.permission.FACTORY_TEST"/>
58-
<uses-permission android:name="android.permission.HARDWARE_TEST"/>
59-
<uses-permission android:name="android.permission.INJECT_EVENTS"/>
60-
<uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW"/>
61-
<uses-permission android:name="android.permission.LOCATION_HARDWARE"/>
62-
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
63-
<uses-permission android:name="android.permission.SET_PROCESS_LIMIT"/>
64-
<uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
65-
<!--uses-permission android:name="android.permission.WRITE_GSERVICES"/ -->
66-
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
67-
68-
<!-- possibly deprecated -->
69-
<uses-permission android:name="android.permission.RECEIVE_EMERGENCY_BROADCAST"/>
70-
<uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
71-
7231
<!-- These are OEM / Samsung Permissions -->
7332
<uses-permission android:name="android.phone.receiveDetailedCallState"/>
7433
<uses-permission android:name="com.android.permission.HANDOVER_STATUS"/>
@@ -178,24 +137,10 @@
178137
</intent-filter>
179138
</receiver>
180139

181-
<!-- We may need to remove the android:permission line in order NOT
182-
to block other (system?) apps who doesn't have or use this permission. -->
183-
<receiver android:name=".receiver.SmsReceiver"
184-
android:permission="android.permission.BROADCAST_SMS">
185-
<intent-filter android:priority="1000">
186-
<action android:name="android.provider.Telephony.SMS_RECEIVED"/>
187-
</intent-filter>
188-
</receiver>
189140
<activity android:name=".activities.CreditsRollActivity"
190141
android:theme="@android:style/Theme.Dialog"
191142
android:screenOrientation="portrait"> </activity>
192143

193-
<activity
194-
android:name=".activities.CustomPopUp"
195-
android:label="@string/title_activity_about_pop_up"
196-
android:theme="@android:style/Theme.Dialog">
197-
</activity>
198-
199144
<activity
200145
android:name=".smsdetection.AdvancedUserActivity"
201146
android:label="@string/title_activity_advanced_user" >

app/src/main/assets/CREDITS renamed to AIMSICD/src/main/assets/CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,3 +236,7 @@ Marek Sebera\n
236236
https://github.com/smarek\n
237237
for saving our project from death!\n
238238
\n
239+
Lars Grefer\n
240+
https://github.com/larsgrefer\n
241+
for all incredible improvements! ;-)\n
242+
\n

app/src/main/assets/CreateDBe_import.sql renamed to AIMSICD/src/main/assets/CreateDBe_import.sql

File renamed without changes.

app/src/main/assets/aimsicd.db renamed to AIMSICD/src/main/assets/aimsicd.db

File renamed without changes.

0 commit comments

Comments
 (0)