Create text

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-412
+413

settings.gradle

@@ -1,2 +1,2 @@
 include ':'
-//include 'nextcloud-android-library'
+//include ':nextcloud-android-library'

src/main/java/com/nextcloud/client/appinfo/AppInfo.java

@@ -19,6 +19,8 @@
  */
 package com.nextcloud.client.appinfo;
 
+import android.content.Context;
+
 /**
  * This class provides general, static information about application
  * build.
@@ -36,4 +38,5 @@ public interface AppInfo {
 
     boolean isDebugBuild();
 
+    String getAppVersion(Context context);
 }

src/main/java/com/nextcloud/client/appinfo/AppInfoImpl.java

@@ -19,7 +19,12 @@
  */
 package com.nextcloud.client.appinfo;
 
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
 import com.owncloud.android.BuildConfig;
+import com.owncloud.android.lib.common.utils.Log_OC;
 
 class AppInfoImpl implements AppInfo {
 
@@ -32,4 +37,20 @@ public String getFormattedVersionCode() {
     public boolean isDebugBuild() {
         return BuildConfig.DEBUG;
     }
+
+    @Override
+    public String getAppVersion(Context context) {
+        try {
+            PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+            if (pInfo != null) {
+                return pInfo.versionName;
+            } else {
+                return "n/a";
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            Log_OC.e(this, "Trying to get packageName", e.getCause());
+
+            return "n/a";
+        }
+    }
 }

src/main/java/com/nextcloud/client/device/DeviceInfo.kt

@@ -29,8 +29,13 @@ import java.util.Locale
 class DeviceInfo {
     val vendor: String = Build.MANUFACTURER.toLowerCase(Locale.ROOT)
     val apiLevel: Int = Build.VERSION.SDK_INT
+    val androidVersion = Build.VERSION.RELEASE
 
     fun hasCamera(context: Context): Boolean {
         return context.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
     }
+
+    fun editorSupported(): Boolean {
+        return apiLevel < Build.VERSION_CODES.LOLLIPOP
+    }
 }

src/main/java/com/nextcloud/client/di/ComponentsModule.java

@@ -63,6 +63,7 @@
 import com.owncloud.android.ui.activity.UploadFilesActivity;
 import com.owncloud.android.ui.activity.UploadListActivity;
 import com.owncloud.android.ui.activity.UserInfoActivity;
+import com.owncloud.android.ui.dialog.ChooseRichDocumentsTemplateDialogFragment;
 import com.owncloud.android.ui.dialog.ChooseTemplateDialogFragment;
 import com.owncloud.android.ui.dialog.MultipleAccountsDialog;
 import com.owncloud.android.ui.fragment.ExtendedListFragment;
@@ -136,6 +137,9 @@ abstract class ComponentsModule {
     @ContributesAndroidInjector abstract FileDetailActivitiesFragment fileDetailActivitiesFragment();
     @ContributesAndroidInjector abstract FileDetailSharingFragment fileDetailSharingFragment();
     @ContributesAndroidInjector abstract ChooseTemplateDialogFragment chooseTemplateDialogFragment();
+
+    @ContributesAndroidInjector
+    abstract ChooseRichDocumentsTemplateDialogFragment chooseRichDocumentsTemplateDialogFragment();
     @ContributesAndroidInjector abstract PreviewImageFragment previewImageFragment();
     @ContributesAndroidInjector abstract ContactListFragment chooseContactListFragment();
     @ContributesAndroidInjector abstract PreviewMediaFragment previewMediaFragment();

src/main/java/com/owncloud/android/datamodel/Template.java

@@ -22,6 +22,8 @@
 
 import org.parceler.Parcel;
 
+import java.util.Locale;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -38,7 +40,20 @@
 @NoArgsConstructor
 public class Template {
     public enum Type {
-        DOCUMENT, SPREADSHEET, PRESENTATION
+        DOCUMENT, SPREADSHEET, PRESENTATION, UNKNOWN
+    }
+
+    public static Type parse(String type) {
+        switch (type.toLowerCase(Locale.US)) {
+            case "document":
+                return Type.DOCUMENT;
+            case "spreadsheet":
+                return Type.SPREADSHEET;
+            case "presentation":
+                return Type.PRESENTATION;
+            default:
+                return Type.UNKNOWN;
+        }
     }
 
     public int id;

src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -31,7 +31,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 52;
+    public static final int DB_VERSION = 53;
 
     private ProviderMeta() {
         // No instance

src/main/java/com/owncloud/android/files/FetchTemplateOperation.java

@@ -25,7 +25,7 @@
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.ui.dialog.ChooseTemplateDialogFragment;
+import com.owncloud.android.ui.dialog.ChooseRichDocumentsTemplateDialogFragment;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -41,14 +41,14 @@ public class FetchTemplateOperation extends RemoteOperation {
     private static final int SYNC_CONNECTION_TIMEOUT = 5000;
     private static final String TEMPLATE_URL = "/ocs/v2.php/apps/richdocuments/api/v1/templates/";
 
-    private ChooseTemplateDialogFragment.Type type;
+    private ChooseRichDocumentsTemplateDialogFragment.Type type;
 
     // JSON node names
     private static final String NODE_OCS = "ocs";
     private static final String NODE_DATA = "data";
     private static final String JSON_FORMAT = "?format=json";
 
-    public FetchTemplateOperation(ChooseTemplateDialogFragment.Type type) {
+    public FetchTemplateOperation(ChooseRichDocumentsTemplateDialogFragment.Type type) {
         this.type = type;
     }
 
@@ -81,7 +81,8 @@ protected RemoteOperationResult run(OwnCloudClient client) {
                     templateArray.add(new Template(templateObject.getInt("id"),
                                                    templateObject.getString("name"),
                                                    templateObject.optString("preview"),
-                                                   Template.Type.valueOf(templateObject.getString("type")),
+                                                   Template.parse(templateObject.getString("type")
+                                                                             .toUpperCase(Locale.ROOT)),
                                                    templateObject.getString("extension")));
                 }