Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8e350e9 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge branch 'master' into 831-room 

# Conflicts:
#	app/build.gradle
parents 20b4163e 1cb9573c

app/build.gradle

+3 −5
Original line number Diff line number Diff line
@@ -14,9 +14,8 @@ android { 
        applicationId "it.niedermann.owncloud.notes"

        minSdkVersion 21

        targetSdkVersion 29

        versionCode 3003000

        versionName "3.3.0"

        multiDexEnabled true

        versionCode 3003001

        versionName "3.3.1"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        javaCompileOptions {

            annotationProcessorOptions {
@@ -35,7 +34,7 @@ android { 
        }



        release {

            minifyEnabled true

            minifyEnabled false

            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

        }

    }
@@ -99,7 +98,6 @@ dependencies { 
    implementation "androidx.room:room-runtime:2.2.6"

    annotationProcessor "androidx.room:room-compiler:2.2.6"



    implementation 'androidx.multidex:multidex:2.0.1'

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'



    // Testing

app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java

+2 −2
Original line number Diff line number Diff line 
package it.niedermann.owncloud.notes;



import android.app.Application;

import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.util.Log;



import androidx.appcompat.app.AppCompatDelegate;

import androidx.multidex.MultiDexApplication;

import androidx.preference.PreferenceManager;



import it.niedermann.owncloud.notes.preferences.DarkModeSetting;



import static androidx.preference.PreferenceManager.getDefaultSharedPreferences;



public class NotesApplication extends MultiDexApplication {

public class NotesApplication extends Application {

    private static final String TAG = NotesApplication.class.getSimpleName();



    private static final long LOCK_TIME = 30_000;

fastlane/metadata/android/en-US/changelogs/3003001.txt

0 → 100644
+2 −0
Original line number Diff line number Diff line 
- 🔒 Prevent screen capture (#1098)

- 🖼 Convert widget previews to WebP to reduce app size (#1120) by @connyduck
 
 No newline at end of file

markdown/build.gradle

+1 −3
Original line number Diff line number Diff line
@@ -7,12 +7,11 @@ android { 
    buildToolsVersion "30.0.3"



    defaultConfig {

        minSdkVersion 19

        minSdkVersion 21

        targetSdkVersion 30



        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        consumerProguardFiles "consumer-rules.pro"

        multiDexEnabled true

    }



    compileOptions {
@@ -57,7 +56,6 @@ dependencies { 
    implementation "com.yydcdut:markdown-processor:$rxMarkdownVersion"

    implementation "com.yydcdut:rxmarkdown-wrapper:$rxMarkdownVersion"



    implementation 'androidx.multidex:multidex:2.0.1'

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'



    testImplementation 'junit:junit:4.13.2'