refactor v1

.gitignore

@@ -1,38 +1,11 @@
-# Built application files
-/*/build/
-build/
-
-# Crashlytics configuations
-com_crashlytics_export_strings.xml
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Gradle generated files
-.gradle/
-
-# Signing files
-.signing/
-
-# User-specific configurations
-.idea/libraries/
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/vcs.xml
 *.iml
-
-# OS-specific files
+.gradle
+/local.properties
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
 .DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
+/build
+/captures
+.externalNativeBuild
+/.idea/caches/build_file_checksums.ser

app/build.gradle

@@ -1,55 +1,54 @@
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 apply plugin: 'io.fabric'
 
-repositories {
-    maven { url 'https://maven.fabric.io/public' }
-    maven { url "https://jitpack.io" }
-    maven { url 'https://maven.google.com' }
-    google()
-}
-
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
-    //TODO addConfig for f-droid
-    defaultConfig {
-        applicationId "org.openobservatory.ooniprobe"
-        minSdkVersion 14
-        targetSdkVersion 27
-        versionCode 28
-        versionName "2.0.0-alpha.2"
-        setProperty("archivesBaseName", "ooniprobe-android-$versionName")
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
+	compileSdkVersion 27
+	buildToolsVersion "28.0.0"
+
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
+	}
+
+	defaultConfig {
+		applicationId "org.openobservatory.ooniprobe"
+		minSdkVersion 17
+		targetSdkVersion 27
+		versionName "2.0"
+		versionCode Integer.parseInt(new SimpleDateFormat("yyyyMMdd").format(new Date()))
+	}
+
+
+	buildTypes {
+		release {
+			minifyEnabled false
+			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+		}
+	}
 }
-//https://firebase.googleblog.com/2016/11/google-play-services-and-firebase-for-android-will-support-api-level-14-at-minimum.html
-//ALT: https://developers.google.com/instance-id/guides/android-implementation
+
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation('com.crashlytics.sdk.android:crashlytics:2.8.0@aar') {
-        transitive = true
-    }
-    implementation 'org.openobservatory.measurement_kit:android-libs:0.8.3-1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
-    implementation 'com.google.code.gson:gson:2.8.0'
-    implementation 'com.google.firebase:firebase-core:16.0.0'
-    implementation 'com.google.firebase:firebase-messaging:17.0.0'
-    implementation 'uk.co.chrisjenx:calligraphy:2.2.0'
-    implementation 'com.github.AndroidDeveloperLB:AutoFitTextView:4'
-    implementation 'com.airbnb.android:lottie:2.2.5'
-    implementation 'com.github.apl-devs:appintro:v4.2.2'
-    testImplementation 'junit:junit:4.12'
+	implementation 'com.android.support:appcompat-v7:27.1.1'
+	implementation 'com.android.support:cardview-v7:27.1.1'
+	implementation 'com.android.support:preference-v7:27.1.1'
+
+	implementation 'com.google.firebase:firebase-messaging:17.0.0'
+
+	annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:4.2.4"
+	implementation "com.github.Raizlabs.DBFlow:dbflow-core:4.2.4"
+	implementation "com.github.Raizlabs.DBFlow:dbflow:4.2.4"
+
+	annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+	implementation 'com.jakewharton:butterknife:8.8.1'
+
+	implementation('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') { transitive = true }
+	implementation 'org.openobservatory.measurement_kit:android-libs:0.8.3-1'
+	implementation 'com.github.xanscale:LocalhostToolkit:612c3e77d2'
+	implementation 'pub.devrel:easypermissions:1.2.0'
+	implementation 'com.airbnb.android:lottie:2.5.5'
+	implementation 'com.github.apl-devs:appintro:v4.2.3'
 }
-apply plugin: 'com.google.gms.google-services'
+
+apply plugin: 'com.google.gms.google-services'

app/proguard-rules.pro

@@ -1,17 +1,21 @@
 # Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/sbasso/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
-
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile