Browse Source

fixes from CI

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 5 years ago
parent
commit
74f8a723b8

+ 1 - 1
scripts/analysis/findbugs-results.txt

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

+ 2 - 0
src/main/java/com/owncloud/android/ui/activity/TextEditorWebView.kt

@@ -21,6 +21,7 @@
 
 package com.owncloud.android.ui.activity
 
+import android.annotation.SuppressLint
 import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
@@ -39,6 +40,7 @@ class TextEditorWebView : EditorWebView() {
     @Inject
     lateinit var deviceInfo: DeviceInfo
 
+    @SuppressLint("AddJavascriptInterface") // suppress warning as webview is only used >= Lollipop
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

+ 0 - 3
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1041,9 +1041,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
                     return true;
                 }
                 case R.id.action_edit: {
-                    Account account = ((FileActivity) mContainerActivity).getUserAccountManager()
-                        .getUser().toPlatformAccount();
-
                     // should not be necessary, as menu item is filtered, but better play safe
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                         if (FileMenuFilter.isEditorAvailable(requireContext().getContentResolver(),

+ 0 - 1
src/main/res/values/strings.xml

@@ -837,7 +837,6 @@
     <string name="filename_hint">Filename</string>
     <string name="thumbnail">Thumbnail</string>
     <string name="enter_filename">Please enter a filename</string>
-    <string name="create_file_from_template">Creating file from template…</string>
     <string name="error_retrieving_templates">Error retrieving templates</string>
     <string name="battery_optimization_title">Battery optimization</string>
     <string name="battery_optimization_message">Your device may have battery optimization enabled. AutoUpload works only properly if you exclude this app from it.</string>