mirror of
https://github.com/bitfireAT/davx5-ose
synced 2024-10-14 15:29:16 +00:00
Fix Android 4.4 compatibility; version code bump
This commit is contained in:
parent
f50f86c1ad
commit
77d6fc7243
|
@ -19,7 +19,7 @@ android {
|
|||
defaultConfig {
|
||||
applicationId "at.bitfire.davdroid"
|
||||
|
||||
versionCode 282
|
||||
versionCode 283
|
||||
buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
|
||||
buildConfigField "boolean", "customCerts", "true"
|
||||
|
||||
|
@ -84,7 +84,7 @@ dependencies {
|
|||
implementation 'androidx.multidex:multidex:2.0.1'
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
|
||||
|
||||
implementation 'androidx.appcompat:appcompat:1.0.2'
|
||||
implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
|
||||
implementation 'androidx.cardview:cardview:1.0.0'
|
||||
implementation 'androidx.fragment:fragment-ktx:1.0.0'
|
||||
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
|
||||
|
|
|
@ -662,8 +662,8 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
|
|||
}
|
||||
|
||||
class ContactsPermissionsCalculator(
|
||||
val context: Context,
|
||||
val addressBooks: LiveData<List<Collection>>
|
||||
private val context: Context,
|
||||
private val addressBooks: LiveData<List<Collection>>
|
||||
): MediatorLiveData<Boolean>() {
|
||||
|
||||
companion object {
|
||||
|
@ -698,8 +698,8 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
|
|||
}
|
||||
|
||||
class CalendarPermissionsCalculator(
|
||||
val context: Context,
|
||||
val serviceId: LiveData<Long>
|
||||
private val context: Context,
|
||||
private val serviceId: LiveData<Long>
|
||||
): MediatorLiveData<List<String>>() {
|
||||
|
||||
companion object {
|
||||
|
|
|
@ -28,13 +28,6 @@
|
|||
android:padding="@dimen/activity_margin"
|
||||
android:animateLayoutChanges="true">
|
||||
|
||||
<ProgressBar
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:indeterminate="true"
|
||||
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
|
||||
android:visibility="@{(model.calDavServiceId == null && model.cardDavServiceId == null) ? View.VISIBLE : View.GONE}"/>
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
@ -77,7 +70,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableLeft="@drawable/ic_error_dark"
|
||||
app:drawableLeftCompat="@drawable/ic_error_dark"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="@string/account_contact_permissions_required"/>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
@ -131,7 +124,7 @@
|
|||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableLeft="@drawable/ic_error_dark"
|
||||
app:drawableLeftCompat="@drawable/ic_error_dark"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="@string/account_calendar_permissions_required"/>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 28d43522912849cf6a0ed7ccacba20be0f648b82
|
||||
Subproject commit 4d704a6f08e683652b93486e02d92bdd0c78b397
|
Loading…
Reference in a new issue