Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Summary
* Enhancement - Delete old logs every week: [#3328](https://github.com/owncloud/android/issues/3328)
* Enhancement - Instant upload only when charging: [#465](https://github.com/owncloud/android/issues/465)
* Enhancement - New Logging Screen 2.0: [#3333](https://github.com/owncloud/android/issues/3333)
* Enhancement - New Splash Screen: [#3391](https://github.com/owncloud/android/issues/3391)

Details
-------
Expand Down Expand Up @@ -97,6 +98,13 @@ Details
https://github.com/owncloud/android/issues/3333
https://github.com/owncloud/android/pull/3408

* Enhancement - New Splash Screen: [#3391](https://github.com/owncloud/android/issues/3391)

A new splash screen has been developed for devices with Android 12 (S) version.

https://github.com/owncloud/android/issues/3391
https://github.com/owncloud/android/pull/3421

Changelog for ownCloud Android Client [2.18.3] (2021-10-27)
=======================================
The following sections list the changes in ownCloud Android Client 2.18.3 relevant to
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext {
// SDK
sdkCompileVersion = 29
sdkCompileVersion = 31
sdkMinVersion = 21
sdkTargetVersion = 29

Expand Down
7 changes: 7 additions & 0 deletions changelog/unreleased/3421
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: New Splash Screen

A new splash screen has been developed for devices
with Android 12 (S) version.

https://github.com/owncloud/android/issues/3391
https://github.com/owncloud/android/pull/3421
3 changes: 3 additions & 0 deletions owncloudApp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ dependencies {
// Preferences
implementation 'androidx.preference:preference-ktx:1.1.1'

//SplashScreen
implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'

// Tests
testImplementation project(':owncloudTestUtil')
testImplementation "junit:junit:$junitVersion"
Expand Down
6 changes: 3 additions & 3 deletions owncloudApp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@
android:supportsPictureInPicture="false"
android:theme="@style/Theme.ownCloud.Toolbar"
tools:targetApi="n">
<activity android:name=".presentation.ui.settings.PrivacyPolicyActivity"></activity>
<activity android:name=".presentation.ui.settings.SettingsActivity"></activity>
<activity android:name=".presentation.ui.settings.PrivacyPolicyActivity"/>
<activity android:name=".presentation.ui.settings.SettingsActivity"/>
<activity
android:name=".ui.activity.SplashActivity"
android:theme="@style/Theme.ownCloud.Splash">
android:theme="@style/Theme.App.Starting">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class DocumentsStorageProvider : DocumentsProvider() {

if (!isWrite) return ParcelFileDescriptor.open(fileToOpen, accessMode)

val handler = Handler(context?.mainLooper)
val handler = context?.mainLooper?.let { Handler(it) }
// Attach a close listener if the document is opened in write mode.
try {
return ParcelFileDescriptor.open(fileToOpen, accessMode, handler) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn

if (sameAccount && sameFile) {
if (success) {
file = storageManager.getFileByPath(uploadedRemotePath)
file = uploadedRemotePath?.let { storageManager.getFileByPath(it) }
}
refreshSecondFragment(
intent.action,
Expand Down Expand Up @@ -1007,11 +1007,13 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
if (linkedToRemotePath == null || isAscendant(linkedToRemotePath)) {
refreshListOfFilesFragment(true)
}
refreshSecondFragment(
intent.action,
downloadedRemotePath,
intent.getBooleanExtra(Extras.EXTRA_DOWNLOAD_RESULT, false)
)
downloadedRemotePath?.let {
refreshSecondFragment(
intent.action,
it,
intent.getBooleanExtra(Extras.EXTRA_DOWNLOAD_RESULT, false)
)
}
invalidateOptionsMenu()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ package com.owncloud.android.ui.activity
import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen

class SplashActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
installSplashScreen()
startActivity(Intent(this, FileDisplayActivity::class.java))
finish()
}
Expand Down
27 changes: 27 additions & 0 deletions owncloudApp/src/main/res/values-v31/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ ownCloud Android client application
~
~ @author Fernando Sanz Velasco
~ Copyright (C) 2021 ownCloud GmbH.
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License version 2,
~ as published by the Free Software Foundation.
~
~ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
~
-->

<resources>
<style name="Theme.App.Starting" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">@color/splash_background</item>
<item name="postSplashScreenTheme">@style/Theme.ownCloud.Toolbar.Drawer</item>
</style>
</resources>
2 changes: 1 addition & 1 deletion owncloudApp/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</style>

<!-- Splash Screen -->
<style name="Theme.ownCloud.Splash">
<style name="Theme.App.Starting" parent="Theme.SplashScreen">
<item name="android:windowBackground">@drawable/splash_screen</item>
</style>

Expand Down