Merge branch 'fat-tire-pie_changes'

guardianproject · Oct 3, 2018 · fc4dc2c · fc4dc2c
2 parents 7f44ace + 9223dd6
commit fc4dc2c
Show file tree

Hide file tree

Showing 44 changed files with 293 additions and 246 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,8 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha03'
-
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha12'
     }
 
 }
@@ -36,20 +35,24 @@ allprojects {
         // these are common variables used in */build.gradle
         version_number = getVersionName()
         group_info = "haven"
-        signal_version = "2.3.0"
-        buildToolsVersion = "27.0.3"
-        compileSdkVersion = 27
+        buildToolsVersion = "28.0.3"
         minSdkVersion = 16
-        targetSdkVersion = 27
-        appcompat = 'com.android.support:appcompat-v7:27.1.1'
+        targetSdkVersion = 28
     }
 
+    /**
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-Xlint:unchecked"
+        }
+    }**/
+
 }
 
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion = '28.0.3'
 
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
@@ -62,7 +65,7 @@ android {
     }
 
     dexOptions {
-        javaMaxHeapSize "1536m"
+        javaMaxHeapSize "2g"
         preDexLibraries true
     }
 
@@ -73,7 +76,7 @@ android {
         versionName getVersionName()
         archivesBaseName = "Haven-$versionName"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -107,30 +110,32 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    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 'com.google.android.material:material:1.0.0'
+    implementation 'com.wdullaer:materialdatetimepicker:3.6.4'
     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'
-    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 'com.github.apl-devs:appintro:master' /* use master until androidx ver is released */
+    implementation 'info.guardianproject.netcipher:netcipher:2.0.0-beta1'
+    implementation 'org.nanohttpd:nanohttpd-webserver:2.3.1'
     implementation 'me.angrybyte.picker:picker:1.3.1'
     implementation 'com.github.stfalcon:frescoimageviewer:0.5.0'
-    implementation 'com.facebook.fresco:fresco:1.9.0'
-    implementation 'com.github.derlio.waveform:library:1.0.3@aar'
+    implementation 'com.facebook.fresco:fresco:1.10.0'
+   // implementation 'com.github.derlio.waveform:library:1.0.3@aar'
+    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.takisoft.fix:preference-v7:27.1.0.0'
-    implementation 'com.wdullaer:materialdatetimepicker:3.5.2'
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.8.10'
-    implementation('com.mikepenz:aboutlibraries:6.0.2@aar') {
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.9.14'
+    implementation('com.mikepenz:aboutlibraries:6.1.1@aar') {
         transitive = true
     }
-    implementation 'com.asksira.android:cameraviewplus:0.9.4'
+    implementation 'com.asksira.android:cameraviewplus:0.9.5'
     implementation 'com.github.halilozercan:BetterVideoPlayer:1.1.0'
     implementation 'io.github.silvaren:easyrs:0.5.3'
     implementation 'org.jcodec:jcodec:0.2.3'

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,5 @@
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+android.enableJetifier=true
+android.useAndroidX=true
+android.enableR8=true
+android.enableD8=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-rc-1-all.zip
-android.enableD8=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+android.enableR8=true
+
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -41,7 +42,9 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:theme="@style/AppTheme"
-        tools:replace="android:allowBackup">
+        android:supportsRtl="false"
+        tools:replace="android:allowBackup,android:supportsRtl"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".ListActivity"
             android:configChanges="orientation|screenSize"
@@ -119,13 +122,14 @@
         </receiver>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="org.havenapp.main.fileprovider"
             android:grantUriPermissions="true"
             android:exported="false">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_provider_paths" />
+                android:resource="@xml/file_provider_paths"
+                />
         </provider>
 
     </application>

diff --git a/src/main/java/org/havenapp/main/HavenApp.java b/src/main/java/org/havenapp/main/HavenApp.java
@@ -17,20 +17,21 @@
 
 package org.havenapp.main;
 
-import android.support.multidex.MultiDexApplication;
-import android.support.v7.app.AppCompatDelegate;
-import android.text.TextUtils;
 import android.util.Log;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
 import com.facebook.imagepipeline.decoder.SimpleProgressiveJpegConfig;
+import com.orm.SchemaGenerator;
 import com.orm.SugarContext;
+import com.orm.SugarDb;
+
+import org.havenapp.main.service.WebServer;
 
 import java.io.IOException;
 
-import org.havenapp.main.service.SignalSender;
-import org.havenapp.main.service.WebServer;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.multidex.MultiDexApplication;
 
 public class HavenApp extends MultiDexApplication {
 
@@ -46,7 +47,10 @@ public class HavenApp extends MultiDexApplication {
     public void onCreate() {
         super.onCreate();
 
-        SugarContext.init(this);
+        SugarContext.init(getApplicationContext());
+
+        SchemaGenerator schemaGenerator = new SchemaGenerator(this);
+        schemaGenerator.createDatabase(new SugarDb(this).getDB());
 
         mPrefs = new PreferenceManager(this);
 

diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
@@ -26,22 +26,15 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-import android.support.v7.widget.helper.ItemTouchHelper;
 import android.telephony.SmsManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
 import com.mikepenz.aboutlibraries.Libs;
 import com.mikepenz.aboutlibraries.LibsBuilder;
 
@@ -57,21 +50,28 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class ListActivity extends AppCompatActivity {
 
     private RecyclerView recyclerView;
-    private FloatingActionButton fab;
-    private Toolbar toolbar;
     private EventAdapter adapter;
     private List<Event> events = new ArrayList<>();
     private PreferenceManager preferences;
 
     private int modifyPos = -1;
 
-    private int REQUEST_CODE_INTRO = 1001;
+    private final static int REQUEST_CODE_INTRO = 1001;
 
 
-    private Handler handler = new Handler();
+    final private Handler handler = new Handler();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -81,8 +81,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         preferences = new PreferenceManager(this.getApplicationContext());
         recyclerView = findViewById(R.id.main_list);
-        fab = findViewById(R.id.fab);
-        toolbar = findViewById(R.id.toolbar);
+        FloatingActionButton fab = findViewById(R.id.fab);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         LinearLayoutManager llm = new LinearLayoutManager(this);
@@ -96,7 +96,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ItemTouchHelper.SimpleCallback simpleCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
 
             @Override
-            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+            public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
                 return false;
             }
 
@@ -122,12 +122,12 @@ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
 
             Drawable drawable = ContextCompat.getDrawable(this, R.drawable.ic_play_arrow);
-            drawable = DrawableCompat.wrap(drawable);
-            DrawableCompat.setTint(drawable, Color.WHITE);
-            DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);
-
-            fab.setImageDrawable(drawable);
-
+            if (drawable != null) {
+                drawable = DrawableCompat.wrap(drawable);
+                DrawableCompat.setTint(drawable, Color.WHITE);
+                DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);
+                fab.setImageDrawable(drawable);
+            }
         }
 
 
@@ -313,7 +313,7 @@ public boolean onOptionsItemSelected (MenuItem item) {
 
     private void removeAllEvents()
     {
-        final List<Event> removedEvents = new ArrayList<Event>();
+        final List<Event> removedEvents = new ArrayList<>();
         final Runnable runnableDelete = new Runnable ()
         {
             public void run ()

diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.java
@@ -25,9 +25,6 @@
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Environment;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
@@ -46,6 +43,10 @@
 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 {

diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.java
@@ -19,7 +19,6 @@
 package org.havenapp.main;
 
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -29,6 +28,8 @@
 import java.io.File;
 import java.util.Date;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 
 public class PreferenceManager {
 
@@ -98,7 +99,7 @@ public class PreferenceManager {
 
     public PreferenceManager(Context context) {
         this.context = context;
-        this.appSharedPrefs = context.getSharedPreferences(APP_SHARED_PREFS, Activity.MODE_PRIVATE);
+        this.appSharedPrefs = context.getSharedPreferences(APP_SHARED_PREFS, AppCompatActivity.MODE_PRIVATE);
         this.prefsEditor = appSharedPrefs.edit();
     }
 

diff --git a/src/main/java/org/havenapp/main/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.java
@@ -20,14 +20,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import info.guardianproject.netcipher.proxy.OrbotHelper;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class SettingsActivity extends AppCompatActivity {