diff --git a/_layouts/default.html b/_layouts/default.html
index b57354b6..d45ab327 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,5 +1,5 @@
-
+
diff --git a/build.gradle b/build.gradle
index c9da733b..522c3957 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.3.0'
+ classpath 'com.android.tools.build:gradle:3.5.0-alpha01'
}
}
@@ -110,14 +110,14 @@ android {
}
dependencies {
- implementation 'androidx.appcompat:appcompat:1.0.0'
+ implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.preference:preference:1.0.0'
- implementation 'androidx.multidex:multidex:2.0.0'
- implementation 'androidx.annotation:annotation:1.0.0'
+ implementation 'androidx.multidex:multidex:2.0.1'
+ implementation 'androidx.annotation:annotation:1.0.1'
implementation 'com.google.android.material:material:1.0.0'
- implementation 'com.wdullaer:materialdatetimepicker:3.6.4'
+ implementation 'com.wdullaer:materialdatetimepicker:4.1.1'
implementation 'com.github.guardianproject:signal-cli-android:v0.6.0-android-beta-1'
implementation 'com.github.satyan:sugar:1.5'
implementation 'net.the4thdimension:audio-wife:1.0.3'
@@ -131,7 +131,7 @@ dependencies {
implementation 'com.github.derlio:audio-waveform:v1.0.1'
implementation 'org.firezenk:audiowaves:1.1@aar'
implementation 'com.maxproj.simplewaveform:app:1.0.0'
- implementation 'com.googlecode.libphonenumber:libphonenumber:8.9.14'
+ implementation 'com.googlecode.libphonenumber:libphonenumber:8.10.3'
implementation('com.mikepenz:aboutlibraries:6.1.1@aar') {
transitive = true
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0405f941..c262e42f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,7 +2,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
android.enableR8=true
-
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.java
index 38849798..22e30f63 100644
--- a/src/main/java/org/havenapp/main/MonitorActivity.java
+++ b/src/main/java/org/havenapp/main/MonitorActivity.java
@@ -31,6 +31,10 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
import org.havenapp.main.service.MonitorService;
@@ -43,10 +47,6 @@
import java.io.FileOutputStream;
import java.io.IOException;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
import static org.havenapp.main.Utils.getTimerText;
public class MonitorActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener {
@@ -351,7 +351,7 @@ private void showTimeDelayDialog() {
TimePickerDialog mTimePickerDialog = TimePickerDialog.newInstance(this, hours, minutes, seconds, true);
mTimePickerDialog.enableSeconds(true);
- mTimePickerDialog.show(getFragmentManager(), "TimePickerDialog");
+ mTimePickerDialog.show(getSupportFragmentManager(), "TimePickerDialog");
}
@Override
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
index eb4afbeb..fc28e169 100644
--- a/src/main/java/org/havenapp/main/SettingsFragment.java
+++ b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -22,6 +22,16 @@
import android.widget.Switch;
import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.SwitchPreference;
+
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
@@ -34,16 +44,6 @@
import java.io.File;
import java.util.Locale;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.preference.EditTextPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.SwitchPreference;
-import androidx.preference.SwitchPreferenceCompat;
import info.guardianproject.netcipher.proxy.OrbotHelper;
@@ -86,7 +86,7 @@ public void onCreatePreferences(Bundle bundle, String s) {
}
if (preferences.getSmsActivation()) {
- ((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).setChecked(true);
+ ((SwitchPreference) findPreference(PreferenceManager.SMS_ACTIVE)).setChecked(true);
}
findPreference(PreferenceManager.SMS_NUMBER).setOnPreferenceClickListener(preference -> {
@@ -110,7 +110,7 @@ public void onCreatePreferences(Bundle bundle, String s) {
}
if (preferences.getRemoteAccessActive()) {
- ((SwitchPreferenceCompat) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).setChecked(true);
+ ((SwitchPreference) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).setChecked(true);
}
if (checkValidString(preferences.getRemoteAccessOnion())) {
@@ -141,7 +141,7 @@ public void onCreatePreferences(Bundle bundle, String s) {
if (preferences.getHeartbeatActive())
{
- ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).setChecked(true);
+ ((SwitchPreference) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).setChecked(true);
if (preferences.getHeartbeatActive()) {
findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));
}
@@ -224,7 +224,7 @@ protected void save() {
preferences.setSignalUsername(((EditTextPreference) findPreference(PreferenceManager.REGISTER_SIGNAL)).getText());
- boolean remoteAccessActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
+ boolean remoteAccessActive = ((SwitchPreference) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
preferences.activateRemoteAccess(remoteAccessActive);
String password = ((EditTextPreference) findPreference(PreferenceManager.REMOTE_ACCESS_CRED)).getText();
@@ -237,7 +237,7 @@ protected void save() {
preferences.setVoiceVerification(false);
- boolean heartbeatMonitorActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
+ boolean heartbeatMonitorActive = ((SwitchPreference) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
preferences.activateHeartbeat(heartbeatMonitorActive);
@@ -319,7 +319,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
setPhoneNumber();
break;
case PreferenceManager.REMOTE_ACCESS_ACTIVE:
- boolean remoteAccessActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
+ boolean remoteAccessActive = ((SwitchPreference) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
if (remoteAccessActive) {
checkRemoteAccessOnion();
app.startServer();
@@ -349,7 +349,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
break;
}
case PreferenceManager.SMS_NUMBER:
- boolean smsActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
+ boolean smsActive = ((SwitchPreference) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
if (smsActive && TextUtils.isEmpty(preferences.getSignalUsername())) {
askForPermission(Manifest.permission.SEND_SMS, 6);
askForPermission(Manifest.permission.READ_PHONE_STATE, 6);
@@ -395,7 +395,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
}
case PreferenceManager.HEARTBEAT_MONITOR_ACTIVE: {
boolean isMonitoring = preferences.getHeartbeatActive();
- boolean hbSwitchOn = ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
+ boolean hbSwitchOn = ((SwitchPreference) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
if (!isMonitoring && hbSwitchOn) {
preferences.activateHeartbeat(true);
findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));
@@ -423,7 +423,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
preferences.setHeartbeatMonitorNotifications(notificationTimeMs);
findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));
- boolean heartbeatActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
+ boolean heartbeatActive = ((SwitchPreference) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
if (heartbeatActive && preferences.getMonitorServiceActive()) {
SignalSender sender = SignalSender.getInstance(getActivity(), preferences.getSignalUsername());
sender.stopHeartbeatTimer();
@@ -452,7 +452,7 @@ private void setDefaultStoragePath () {
}
private void setPhoneNumber() {
- boolean smsActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
+ boolean smsActive = ((SwitchPreference) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
String phoneNumber = ((EditTextPreference) findPreference(PreferenceManager.SMS_NUMBER)).getText();
if (smsActive && checkValidString(phoneNumber)) {
preferences.activateSms(true);
@@ -484,9 +484,9 @@ private void showTimeDelayDialog(String configVideoLength) {
TimePickerDialog mTimePickerDialog = TimePickerDialog.newInstance(this, hours, minutes, seconds, true);
mTimePickerDialog.enableSeconds(true);
if (configVideoLength.equalsIgnoreCase(PreferenceManager.CONFIG_TIME_DELAY)) {
- mTimePickerDialog.show(mActivity.getFragmentManager(), "TimeDelayPickerDialog");
+ mTimePickerDialog.show(getFragmentManager(), "TimeDelayPickerDialog");
} else {
- mTimePickerDialog.show(mActivity.getFragmentManager(), "VideoLengthPickerDialog");
+ mTimePickerDialog.show(getFragmentManager(), "VideoLengthPickerDialog");
}
}
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
index 2542bbdc..651dd7d1 100644
--- a/src/main/java/org/havenapp/main/service/MonitorService.java
+++ b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -26,6 +26,8 @@
import android.telephony.SmsManager;
import android.text.TextUtils;
+import androidx.core.app.NotificationCompat;
+
import org.havenapp.main.HavenApp;
import org.havenapp.main.MonitorActivity;
import org.havenapp.main.PreferenceManager;
@@ -42,8 +44,6 @@
import java.util.Date;
import java.util.StringTokenizer;
-import androidx.core.app.NotificationCompat;
-
@SuppressLint("HandlerLeak")
public class MonitorService extends Service {
@@ -181,8 +181,7 @@ public IBinder onBind(Intent intent) {
/**
* Show a notification while this service is running.
*/
- @SuppressWarnings("deprecation")
- private void showNotification() {
+ private void showNotification() {
Intent toLaunch = new Intent(getApplicationContext(),
MonitorActivity.class);
diff --git a/src/main/res/layout/activity_event.xml b/src/main/res/layout/activity_event.xml
index e0481adb..55cc3312 100644
--- a/src/main/res/layout/activity_event.xml
+++ b/src/main/res/layout/activity_event.xml
@@ -39,7 +39,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:listitem="@layout/item_event"
- app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+ app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/>
+ app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/>
-
@@ -101,7 +101,7 @@
-
@@ -118,7 +118,7 @@
-