Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused and duplicate dependencies #58

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove unused and duplicate dependencies #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bbdeb0
Remove unused and duplicate dependencies
SkewedZeppelin Jun 24, 2018
4abcc1d
Remove database encryption support
SkewedZeppelin Jun 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ allprojects {
}

dependencies {
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
Expand All @@ -49,16 +48,8 @@ dependencies {
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:26.1.0'
compile 'com.android.support:support-v4:26.1.0'
compile 'org.greenrobot:greendao:3.2.2'
compile 'net.zetetic:android-database-sqlcipher:3.5.7'

compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:26.1.0'
compile 'com.android.support:support-v4:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0'
compile 'com.android.support:recyclerview-v7:26.1.0'
compile 'com.github.PhilJay:MPAndroidChart:v3.0.0-beta1'
compile 'org.greenrobot:greendao:3.2.2'

testCompile 'junit:junit:4.12'
testCompile 'org.json:json:20171018'
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/org/secuso/privacyfriendlynetmonitor/DatabaseUtil/DBApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ Beckmann and Markus Hau (https://github.com/SecUSo/privacy-friendly-app-example)

public class DBApp extends Application {

public static final boolean ENCRYPTED = false;

private static DaoSession daoSession;
private static DBApp mContext;

Expand Down Expand Up @@ -93,8 +91,8 @@ static class DBAppAsyncTask extends AsyncTask {
@Override
protected Object doInBackground(Object[] objects) {
System.out.println("Starting Database Async Task");
DaoMaster.DevOpenHelper helper = new DaoMaster.DevOpenHelper(mContext, ENCRYPTED ? "reports-db-encrypted" : "reports-db");
Database db = ENCRYPTED ? helper.getEncryptedWritableDb("super-secret") : helper.getWritableDb();
DaoMaster.DevOpenHelper helper = new DaoMaster.DevOpenHelper(mContext, "reports-db");
Database db = helper.getWritableDb();

Map map = selectedAppsPreferences.getAll();
if (!map.isEmpty() && map.get("Version") != null && !map.get("Version").equals("")) {
Expand Down