mirror of https://github.com/M66B/FairEmail.git
Updated AndroidX
This commit is contained in:
parent
6fb004eacd
commit
25babe4f41
|
@ -325,12 +325,12 @@ dependencies {
|
||||||
|
|
||||||
def startup_version = "1.1.0"
|
def startup_version = "1.1.0"
|
||||||
def annotation_version_experimental = "1.2.0"
|
def annotation_version_experimental = "1.2.0"
|
||||||
def core_version = "1.7.0" // 1.8.0-beta01 / 1.9.0-alpha03
|
def core_version = "1.8.0-rc01" // 1.9.0-alpha03
|
||||||
def shortcuts_version = "1.0.0"
|
def shortcuts_version = "1.0.0"
|
||||||
def appcompat_version = "1.4.1" // 1.6.0-alpha01
|
def appcompat_version = "1.4.1" // 1.6.0-alpha01
|
||||||
def emoji_version = "1.2.0-alpha04"
|
def emoji_version = "1.2.0-alpha04"
|
||||||
def activity_version = "1.4.0" // 1.5.0-beta01 / 1.6.0-alpha03
|
def activity_version = "1.5.0-rc01" // 1.6.0-alpha03
|
||||||
def fragment_version = "1.4.1" // 1.5.0-beta01
|
def fragment_version = "1.5.0-rc01"
|
||||||
def windows_version = "1.0.0" // 1.1.0-alpha01
|
def windows_version = "1.0.0" // 1.1.0-alpha01
|
||||||
def webkit_version = "1.4.0"
|
def webkit_version = "1.4.0"
|
||||||
def recyclerview_version = "1.2.1" // 1.3.0-alpha02
|
def recyclerview_version = "1.2.1" // 1.3.0-alpha02
|
||||||
|
@ -341,7 +341,7 @@ dependencies {
|
||||||
def lbm_version = "1.1.0"
|
def lbm_version = "1.1.0"
|
||||||
def swiperefresh_version = "1.2.0-alpha01"
|
def swiperefresh_version = "1.2.0-alpha01"
|
||||||
def documentfile_version = "1.1.0-alpha01"
|
def documentfile_version = "1.1.0-alpha01"
|
||||||
def lifecycle_version = "2.4.0" // 2.5.0-beta01
|
def lifecycle_version = "2.5.0-rc01"
|
||||||
def lifecycle_extensions_version = "2.2.0"
|
def lifecycle_extensions_version = "2.2.0"
|
||||||
def room_version = "2.4.2" // 2.5.0-alpha01
|
def room_version = "2.4.2" // 2.5.0-alpha01
|
||||||
def sqlite_version = "2.2.0" // 2.3.0-alpha02
|
def sqlite_version = "2.2.0" // 2.3.0-alpha02
|
||||||
|
@ -463,7 +463,9 @@ dependencies {
|
||||||
//implementation "androidx.paging:paging-runtime:$paging_version"
|
//implementation "androidx.paging:paging-runtime:$paging_version"
|
||||||
|
|
||||||
// https://mvnrepository.com/artifact/androidx.preference/preference
|
// https://mvnrepository.com/artifact/androidx.preference/preference
|
||||||
implementation "androidx.preference:preference:$preference_version"
|
implementation("androidx.preference:preference:$preference_version") {
|
||||||
|
exclude group: "androidx.fragment", module: "fragment-ktx"
|
||||||
|
}
|
||||||
|
|
||||||
// https://mvnrepository.com/artifact/androidx.work/work-runtime
|
// https://mvnrepository.com/artifact/androidx.work/work-runtime
|
||||||
implementation "androidx.work:work-runtime:$work_version"
|
implementation "androidx.work:work-runtime:$work_version"
|
||||||
|
|
|
@ -536,7 +536,7 @@
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
android:name="androidx.core.content.FileProvider"
|
android:name="eu.faircode.email.FileProviderEx"
|
||||||
android:authorities="${applicationId}"
|
android:authorities="${applicationId}"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:grantUriPermissions="true">
|
android:grantUriPermissions="true">
|
||||||
|
|
|
@ -535,7 +535,7 @@
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
android:name="androidx.core.content.FileProvider"
|
android:name="eu.faircode.email.FileProviderEx"
|
||||||
android:authorities="${applicationId}"
|
android:authorities="${applicationId}"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:grantUriPermissions="true">
|
android:grantUriPermissions="true">
|
||||||
|
|
|
@ -535,7 +535,7 @@
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
android:name="androidx.core.content.FileProvider"
|
android:name="eu.faircode.email.FileProviderEx"
|
||||||
android:authorities="${applicationId}"
|
android:authorities="${applicationId}"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:grantUriPermissions="true">
|
android:grantUriPermissions="true">
|
||||||
|
|
|
@ -534,7 +534,7 @@
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
android:name="androidx.core.content.FileProvider"
|
android:name="eu.faircode.email.FileProviderEx"
|
||||||
android:authorities="${applicationId}"
|
android:authorities="${applicationId}"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:grantUriPermissions="true">
|
android:grantUriPermissions="true">
|
||||||
|
|
|
@ -83,6 +83,9 @@ public class MediatorLiveData<T> extends MutableLiveData<T> {
|
||||||
*/
|
*/
|
||||||
@MainThread
|
@MainThread
|
||||||
public <S> void addSource(@NonNull LiveData<S> source, @NonNull Observer<? super S> onChanged) {
|
public <S> void addSource(@NonNull LiveData<S> source, @NonNull Observer<? super S> onChanged) {
|
||||||
|
if (source == null) {
|
||||||
|
throw new NullPointerException("source cannot be null");
|
||||||
|
}
|
||||||
Source<S> e = new Source<>(source, onChanged);
|
Source<S> e = new Source<>(source, onChanged);
|
||||||
Source<?> existing = mSources.putIfAbsent(source, e);
|
Source<?> existing = mSources.putIfAbsent(source, e);
|
||||||
if (existing != null && existing.mObserver != onChanged) {
|
if (existing != null && existing.mObserver != onChanged) {
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
package eu.faircode.email;
|
||||||
|
|
||||||
|
/*
|
||||||
|
This file is part of FairEmail.
|
||||||
|
|
||||||
|
FairEmail is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
FairEmail is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Copyright 2018-2022 by Marcel Bokhorst (M66B)
|
||||||
|
*/
|
||||||
|
|
||||||
|
import androidx.core.content.FileProvider;
|
||||||
|
|
||||||
|
public class FileProviderEx extends FileProvider {
|
||||||
|
// https://android-review.googlesource.com/c/platform/frameworks/support/+/1978527
|
||||||
|
public FileProviderEx() {
|
||||||
|
super(R.xml.fileprovider_paths);
|
||||||
|
}
|
||||||
|
}
|
|
@ -536,7 +536,7 @@
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
android:name="androidx.core.content.FileProvider"
|
android:name="eu.faircode.email.FileProviderEx"
|
||||||
android:authorities="${applicationId}"
|
android:authorities="${applicationId}"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:grantUriPermissions="true">
|
android:grantUriPermissions="true">
|
||||||
|
|
Loading…
Reference in New Issue