Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

More library/tools updates to latest

fattire32658810e047
diff --git a/build.gradle b/build.gradle
index f481901..d16353f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.0-alpha09'
+ classpath 'com.android.tools.build:gradle:3.2.0-alpha06'
}
@@ -41,7 +41,7 @@ allprojects {
compileSdkVersion = 27
minSdkVersion = 16
targetSdkVersion = 27
- appcompat = 'com.android.support:appcompat-v7:27.0.3'
+ appcompat = 'com.android.support:appcompat-v7:27.1.0'
}
}
@@ -97,30 +97,29 @@ android {
checkReleaseBuilds false
abortOnError false
}
-
}
dependencies {
- implementation 'com.android.support:support-v4:27.0.2'
- implementation 'com.android.support:appcompat-v7:27.0.2'
- implementation 'com.android.support:design:27.0.2'
- implementation 'com.android.support:cardview-v7:27.0.2'
+ implementation 'com.android.support:support-v13:27.1.0'
+ implementation 'com.android.support:appcompat-v7:27.1.0'
+ implementation 'com.android.support:design:27.1.0'
+ implementation 'com.android.support:cardview-v7:27.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.github.guardianproject:signal-cli-android:-SNAPSHOT'
implementation 'com.github.satyan:sugar:1.5'
- implementation 'com.squareup.picasso:picasso:2.5.2'
+ implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'net.the4thdimension:audio-wife:1.0.3'
- implementation 'com.github.apl-devs:appintro:v4.2.2'
+ implementation 'com.github.apl-devs:appintro:v4.2.3'
implementation 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
implementation 'com.nanohttpd:nanohttpd-webserver:2.2.0'
implementation 'me.angrybyte.picker:picker:1.3.1'
implementation 'com.github.stfalcon:frescoimageviewer:0.5.0'
- implementation 'com.facebook.fresco:fresco:1.8.0'
+ implementation 'com.facebook.fresco:fresco:1.8.1'
implementation 'com.github.derlio.waveform:library:1.0.3@aar'
implementation 'org.firezenk:audiowaves:1.1@aar'
implementation 'com.maxproj.simplewaveform:app:1.0.0'
- implementation 'com.takisoft.fix:preference-v7:27.0.2.0'
- implementation 'com.wdullaer:materialdatetimepicker:3.5.0'
+ implementation 'com.takisoft.fix:preference-v7:27.1.0.0'
+ implementation 'com.wdullaer:materialdatetimepicker:3.5.2'
implementation('com.mikepenz:aboutlibraries:6.0.2@aar') {
transitive = true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6fab844..2560e23 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
android.enableD8=true
\ No newline at end of file
diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
index e619037..1282b53 100644
--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
@@ -103,7 +103,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
break;
case EventTrigger.CAMERA:
holder.image.setVisibility(View.VISIBLE);
- Picasso.with(context).load(new File(eventTrigger.getPath())).into(holder.image);
+ Picasso.get().load(new File(eventTrigger.getPath())).into(holder.image);
holder.image.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {