mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 15:33:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Tobias Kaminsky 2022-11-04 02:31:56 +01:00
commit 16e4b0a490
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -257,8 +257,8 @@ dependencies {
implementation 'androidx.annotation:annotation:1.5.0'
implementation 'com.vanniktech:emoji-google:0.9.0'
implementation "com.github.cotechde.hwsecurity:hwsecurity-fido:$fidoVersion"
implementation "com.github.cotechde.hwsecurity:hwsecurity-fido2:$fidoVersion"
implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$fidoVersion"
implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido2:$fidoVersion"
// document scanner not available on FDroid (generic) due to OpenCV binaries
gplayImplementation "com.github.zynkware:Document-Scanning-Android-SDK:$documentScannerVersion"

2
app/src/main/AndroidManifest.xml
View file

@ -344,7 +344,7 @@
<activity
android:name=".authentication.AuthenticatorActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
android:exported="true"
android:launchMode="singleTask"
android:theme="@style/Theme.ownCloud.noActionBar.Login">

1
app/src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java
View file

@ -260,7 +260,6 @@ public class SetupEncryptionDialogFragment extends DialogFragment implements Inj
binding.encryptionStatus.setText(R.string.end_to_end_encryption_retrieving_keys);
positiveButton.setVisibility(View.INVISIBLE);
neutralButton.setVisibility(View.INVISIBLE);
}
@Override

19
app/src/main/res/layout/list_fragment.xml
View file

@ -29,15 +29,16 @@
android:footerDividersEnabled="false"
android:visibility="visible"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<com.owncloud.android.ui.EmptyRecyclerView
android:id="@+id/list_root"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent">
<com.owncloud.android.ui.EmptyRecyclerView
android:id="@+id/list_root"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include
android:id="@+id/empty_list"
layout="@layout/empty_list" />
</FrameLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<include
android:id="@+id/empty_list"
layout="@layout/empty_list" />
</RelativeLayout>

2
build.gradle
View file

@ -12,7 +12,7 @@ buildscript {
mockkVersion = "1.13.2"
espressoVersion = "3.4.0"
workRuntime = "2.7.1"
fidoVersion = "4.1.0"
fidoVersion = "4.1.0-patch1"
checkerVersion = "3.21.2"
exoplayerVersion = "2.18.1"
documentScannerVersion = "1.0.1"