Fix crashes

CHANGELOG.md

@@ -1,3 +1,16 @@
+3.9.0 (November, 12, 2019)
+
+- preview Markdown with syntax highlighting @AndyScherzinger
+- improved DavX5 integration @bitfireAT
+- AutoUpload: allow files to upload into subfolder
+- new media player service @ezaquarii
+- Remote wipe integration
+- Print from within Collabora
+- enhanced SingleSignOn
+- outdated server warning set to NC14
+
+For a full list, please see https://github.com/nextcloud/android/milestone/38
+
 ## 3.8.1 (October, 11, 2019)
 
 - upload images into subfolder, if source folder also has subfolder

CONTRIBUTING.md

@@ -23,6 +23,8 @@
         1. Backport pull request
         1. Pull requests that also need changes on library
         1. Adding new files
+	1. File naming
+        1. Menu files
     1. Translations
 1. Releases
     1. Types
@@ -236,6 +238,24 @@ Source code of app:
 -->
 ```
 
+## File naming
+
+The file naming patterns are inspired and based on [Ribot's Android Project And Code Guidelines](https://github.com/ribot/android-guidelines/blob/c1d8c9c904eb31bf01fe24aadb963b74281fe79a/project_and_code_guidelines.md).
+
+### Menu files
+
+Similar to layout files, menu files should match the name of the component. For example, if we are defining a menu file that is going to be used in the `UserProfileActivity`, then the name of the file should be `activity_user_profile.xml`. Same pattern applies for menus used in adapter view items, dialogs, etc.
+
+| Component        | Class Name             | Menu Name                   |
+| ---------------- | ---------------------- | ----------------------------- |
+| Activity         | `UserProfileActivity`  | `activity_user_profile.xml`   |
+| Fragment         | `SignUpFragment`       | `fragment_sign_up.xml`        |
+| Dialog           | `ChangePasswordDialog` | `dialog_change_password.xml`  |
+| AdapterView item | ---                    | `item_person.xml`             |
+| Partial layout   | ---                    | `partial_stats_bar.xml`       | 
+
+A good practice is to not include the word `menu` as part of the name because these files are already located in the `menu` directory. In case a component uses several menus in different places (via popup menus) then the resource name would be extended. For example, if the user profile activity has two popup menus for configuring the users settings and one for the handling group assignments then the file names for the menus would be: `activity_user_profile_user_settings.xml` and `activity_user_profile_group_assignments.xml`.
+
 ## Translations
 We manage translations via [Transifex](https://www.transifex.com/nextcloud/nextcloud/android/). So just request joining the translation team for Android on the site and start translating. All translations will then be automatically pushed to this repository, there is no need for any pull request for translations.
 

build.gradle

@@ -7,7 +7,7 @@
 import com.github.spotbugs.SpotBugsTask
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()
@@ -20,13 +20,13 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath('com.dicedmelon.gradle:jacoco-android:0.1.4') {
             exclude group: 'org.codehaus.groovy', module: 'groovy-all'
         }
         classpath 'gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.6'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.1.1"
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.2.0"
     }
 }
 
@@ -58,7 +58,7 @@ configurations {
 ext {
     jacocoVersion = "0.8.2"
     daggerVersion = "2.25.2"
-    markwonVersion =  "4.1.2"
+    markwonVersion =  "4.2.0"
     prismVersion = "2.0.0"
     androidLibraryVersion = "master-SNAPSHOT"
 
@@ -105,7 +105,12 @@ android {
         abortOnError false
         htmlReport true
         htmlOutput file("$project.buildDir/reports/lint/lint.html")
-        disable 'MissingTranslation', 'GradleDependency', 'VectorPath', 'IconMissingDensityFolder', 'IconDensities'
+        disable 'MissingTranslation',
+            'GradleDependency',
+            'VectorPath',
+            'IconMissingDensityFolder',
+            'IconDensities',
+            'GoogleAppIndexingWarning'
     }
 
     dexOptions {
@@ -162,8 +167,8 @@ android {
             versionDev {
                 applicationId "com.nextcloud.android.beta"
                 dimension "default"
-                versionCode 20191102
-                versionName "20191102"
+                versionCode 20191127
+                versionName "20191127"
             }
 
             qa {
@@ -273,7 +278,7 @@ dependencies {
     implementation 'com.jakewharton:disklrucache:2.0.2'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.1.0'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0"
     implementation "androidx.work:work-runtime:2.2.0"
     implementation "androidx.work:work-runtime-ktx:2.2.0"
@@ -292,7 +297,7 @@ dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15'
     implementation 'com.github.tobiaskaminsky:qrcodescanner:0.1.2.2' // 'com.github.blikoon:QRCodeScanner:0.1.2'
-    implementation 'com.google.android:flexbox:1.1.1'
+    implementation 'com.google.android:flexbox:2.0.0'
     implementation 'org.parceler:parceler-api:1.1.12'
     kapt 'org.parceler:parceler:1.1.12'
     implementation('com.github.bumptech.glide:glide:3.8.0') {
@@ -301,7 +306,7 @@ dependencies {
     implementation 'com.caverock:androidsvg:1.4'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'org.jetbrains:annotations:17.0.0'
+    implementation 'org.jetbrains:annotations:18.0.0'
 
     implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido:2.5.1'
 

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-423
+406

spotbugs-filter.xml

@@ -17,7 +17,8 @@
     <Match>
         <Or>
             <Class name="~.*\.Dagger.*" />
-            <Class name="~com.nextcloud.client.di\..*_.*" />
+            <Class name="~com\.nextcloud\.client\.di\..*_.*" />
+			<Class name="~dagger\.android\..*" />
         </Or>
     </Match>
     <!-- Dagger generated code uses internal APIs -->
@@ -30,7 +31,7 @@
     <Match>
         <Or>
             <Class name="~.*BindingImpl"/>
-            <Class name="~.*\.DataBinderMapperImpl"/>
+            <Class name="~.*\.DataBinderMapperImpl"/>	
         </Or>
     </Match>
 
@@ -39,6 +40,10 @@
 	    <Or>
 	        <Package name="~io\.noties\..*" />
 			<Package name="~third_parties\.ezvcard_android\..*" />
+			<Package name="~com\.afollestad\.sectionedrecyclerview\..*" />
+			<Package name="~butterknife\..*" />
+			<Package name="~de\.cotech\..*" />
+			<Package name="~pl\.droidsonroids\..*" />
 		</Or>
 	</Match>
 	 <Match>

src/androidTest/java/com/owncloud/android/UploadIT.java

@@ -120,7 +120,7 @@ public RemoteOperationResult testUpload(OCUpload ocUpload) {
             account,
             null,
             ocUpload,
-            false,
+            FileUploader.NameCollisionPolicy.DEFAULT,
             FileUploader.LOCAL_BEHAVIOUR_COPY,
             targetContext,
             false,
@@ -140,17 +140,17 @@ public void testUploadInNonExistingFolder() {
         OCUpload ocUpload = new OCUpload(FileStorageUtils.getSavePath(account.name) + "/empty.txt",
                 "/testUpload/2/3/4/1.txt", account.name);
         UploadFileOperation newUpload = new UploadFileOperation(
-                storageManager,
-                connectivityServiceMock,
-                powerManagementServiceMock,
-                account,
-                null,
-                ocUpload,
-                false,
-                FileUploader.LOCAL_BEHAVIOUR_COPY,
-                targetContext,
-                false,
-                false
+            storageManager,
+            connectivityServiceMock,
+            powerManagementServiceMock,
+            account,
+            null,
+            ocUpload,
+            FileUploader.NameCollisionPolicy.DEFAULT,
+            FileUploader.LOCAL_BEHAVIOUR_COPY,
+            targetContext,
+            false,
+            false
         );
         newUpload.addRenameUploadListener(() -> {
             // dummy

src/generic/fastlane/metadata/android/cs-CZ/full_description.txt

@@ -1,19 +1,17 @@
-Svobodně licencovaná Nexcloud Android aplikace, dávající vám mobilní svobodu.
-
+Software, který můžete nasadit na vlastní server a ten organizuje ukládání a synchronizaci souborů. Díky doplňkům jde o kompletní groupwarové řešení.
 Funkce:
-* Snadno použitelné moderní rozhraní, přizpůsobené vzhledu, používaném na vašem serveru
-* Nahrávejte soubory na svůj Nextcloud server
-* Sdílejte je s ostatními
-* Udržujte své oblíbené soubory a složky synchronizované
-* Hledejte napříč všemi složkami na svém serveru
-* Automaticky nahrávejte své fotky a videa, pořízená zařízením
-* Udržujte si přehled pomocí oznámení
-* Podporuje vícero účtů
-* Zabezpečený přístup k vašim datům pomocí otisku prstu nebo PIN kódu
-* Napojení na DAVx5 (dříve známé pod názvem DAVdroid) pro snadné nastavení synchronizace kalendáře a kontaktů
-
- Veškeré nalezené problémy hlaste na https://github.com/nextcloud/android/issues a diskutujte o aplikaci na https://help.nextcloud.com/c/clients/android
+* Soubory nahrané do nexcloudu lze snadno sdílet s ostatními.
+* Přístup odkudkoli přes webové a mobilní rozhraní.
+* Synchronizace s počítačem umožňující offline práci.
+* Vaše data jsou na vašem serveru a máte nad nimi plnou kontrolu.
+* Jde o svobodný software, který snadno můžete sami hostovat a volně si ho přizplsobit.  V případě potřeby je ale k dispozici komerční podpora.
+* Vyhledávání napříč soubory.
+* Synchronizace kontaktů a zpráv.
+* Sdílení kalendářů do mobilu (DAVx5/DAVdroid)
+* Neomezený počet uživatelů, autoupload fotek přímo z mobilu, oznámení, 
+* Klienti pro WIndows, MacOS, iOS, Android, web.
+* Mnoho dalších doplňků s dalšími funkcemi.
 
-Noví v Nextcloud? Nextcloud je soukromý server pro synchronizaci souborů a jejich sdílení, dále pro komunikaci. Jedná se o svobodný software a můžete ho hostovat svými silami nebo za to zaplatit nějaké společnosti. Tím máte pod kontrolou své fotky, kalendář a kontakty, dokumenty a vše ostatní.
+Díky Nextcloudu budete mít kompletní privátní řešení pro všechy vaše soubory, fotky, kalendáře a kontakty. 
 
-Podívejte se na Nextcloud na https://nextcloud.com
+Připomínky  zasílejte na https://github.com/nextcloud/android/issues, diskutovat lze na https://help.nextcloud.com/c/clients a vše ostatní najdete na  https://nextcloud.com 

src/generic/fastlane/metadata/android/cs-CZ/short_description.txt

@@ -1 +1 @@
-Produktivní platforma hostovaná u vás, kde vaše data jsou opravdu vaše
+Platforma pro produktivitu hostovaná u vás, kde vaše data jsou opravdu vaše

src/main/java/com/nextcloud/client/account/AnonymousUser.kt

@@ -0,0 +1,58 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Chris Narkiewicz <hello@ezaquarii.com>
+ * Copyright (C) 2019 Chris Narkiewicz
+ * Copyright (C) 2019 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.nextcloud.client.account
+
+import android.accounts.Account
+import android.content.Context
+import android.net.Uri
+import com.owncloud.android.MainApp
+import com.owncloud.android.R
+import com.owncloud.android.lib.common.OwnCloudAccount
+import com.owncloud.android.lib.common.OwnCloudBasicCredentials
+import java.net.URI
+
+/**
+ * This object represents anonymous user, ie. user that did not log in the Nextcloud server.
+ * It serves as a semantically correct "empty value", allowing simplification of logic
+ * in various components requiring user data, such as DB queries.
+ */
+internal class AnonymousUser(private val accountType: String) : User {
+
+    companion object {
+        @JvmStatic
+        fun fromContext(context: Context): AnonymousUser {
+            val type = context.getString(R.string.account_type)
+            return AnonymousUser(type)
+        }
+    }
+
+    override val accountName: String = "anonymous"
+    override val server = Server(URI.create(""), MainApp.MINIMUM_SUPPORTED_SERVER_VERSION)
+    override val isAnonymous = true
+
+    override fun toPlatformAccount(): Account {
+        return Account(accountName, accountType)
+    }
+
+    override fun toOwnCloudAccount(): OwnCloudAccount {
+        return OwnCloudAccount(Uri.EMPTY, OwnCloudBasicCredentials("", ""))
+    }
+}

src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java

@@ -2,19 +2,31 @@
 
 import android.accounts.Account;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 /**
- * This interface provides access to currently selected user Account.
+ * This interface provides access to currently selected user.
+ *
  * @see UserAccountManager
  */
-@FunctionalInterface
 public interface CurrentAccountProvider {
     /**
-     *  Get currently active account.
+     * Get currently active account.
      *
      * @return Currently selected {@link Account} or first valid {@link Account} registered in OS or null, if not available at all.
      */
+    @Deprecated
     @Nullable
     Account getCurrentAccount();
+
+    /**
+     * Get currently active user profile. If there is no actice user, anonymous user is returned.
+     *
+     * @return User profile. Profile is never null.
+     */
+    @NonNull
+    default User getUser() {
+        return new AnonymousUser("dummy");
+    }
 }

src/main/java/com/nextcloud/client/account/RegisteredUser.kt

@@ -0,0 +1,47 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Chris Narkiewicz <hello@ezaquarii.com>
+ * Copyright (C) 2019 Chris Narkiewicz
+ * Copyright (C) 2019 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.nextcloud.client.account
+
+import android.accounts.Account
+import com.owncloud.android.lib.common.OwnCloudAccount
+
+/**
+ * This class represents normal user logged into the Nextcloud server.
+ */
+internal class RegisteredUser(
+    private val account: Account,
+    private val ownCloudAccount: OwnCloudAccount,
+    override val server: Server
+) : User {
+    override val isAnonymous = false
+
+    override val accountName: String get() {
+        return account.name
+    }
+
+    override fun toPlatformAccount(): Account {
+        return account
+    }
+
+    override fun toOwnCloudAccount(): OwnCloudAccount {
+        return ownCloudAccount
+    }
+}