From 63e4f1e3286be67e8f7ef2dbf491f21b27243604 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 27 Nov 2019 07:29:05 +0100 Subject: [PATCH] lint check --- .gitignore | 12 +++--------- owncloudApp/build.gradle | 7 +++++-- owncloudApp/lint.xml | 7 +++++++ .../android/shares/presentation/ShareActivity.kt | 1 + .../owncloud/android/ui/activity/BaseActivity.java | 1 + owncloudApp/src/main/res/menu/file_actions_menu.xml | 4 ++-- 6 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 owncloudApp/lint.xml diff --git a/.gitignore b/.gitignore index 7195b9c5a63..dcc628af0b1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,19 +8,11 @@ # Java class files *.class -# generated files -bin/ -build/ -*.iml -gen/ -target/ - # Local configuration files (sdk path, etc) local.properties oc_framework/local.properties oc_framework-test-project/local.properties tests/local.properties -lint.xml # Mac .DS_Store files .DS_Store @@ -33,13 +25,15 @@ tests/proguard-project.txt # Android Studio and Gradle specific entries .gradle -.idea *.iml build # android sdk captures folder captures +# ignore lint html and xml output +lint-*ml + !.idea/ .idea/* !.idea/codeStyles/ diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index 217512f59dd..a4027e9f3e8 100644 --- a/owncloudApp/build.gradle +++ b/owncloudApp/build.gradle @@ -118,8 +118,11 @@ android { } lintOptions { - abortOnError false - disable 'MissingTranslation' + abortOnError true + ignoreWarnings false + + xmlReport false + htmlOutput file("../lint-app-report.html") } packagingOptions { diff --git a/owncloudApp/lint.xml b/owncloudApp/lint.xml new file mode 100644 index 00000000000..db432cd7e56 --- /dev/null +++ b/owncloudApp/lint.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/owncloudApp/src/main/java/com/owncloud/android/shares/presentation/ShareActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/shares/presentation/ShareActivity.kt index d9d7c92686c..0cab4ea25d5 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/shares/presentation/ShareActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/shares/presentation/ShareActivity.kt @@ -128,6 +128,7 @@ class ShareActivity : FileActivity(), ShareFragmentListener { } override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) when (intent.action) { Intent.ACTION_SEARCH -> { // Verify the action and get the query val query = intent.getStringExtra(SearchManager.QUERY) diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java index 66927e8724d..a5a003faf2f 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java @@ -65,6 +65,7 @@ public abstract class BaseActivity extends AppCompatActivity { @Override protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); Log_OC.v(TAG, "onNewIntent() start"); Account current = AccountUtils.getCurrentOwnCloudAccount(this); if (current != null && mCurrentAccount != null && !mCurrentAccount.name.equals(current.name)) { diff --git a/owncloudApp/src/main/res/menu/file_actions_menu.xml b/owncloudApp/src/main/res/menu/file_actions_menu.xml index 6950aeb0460..5909f985fe3 100644 --- a/owncloudApp/src/main/res/menu/file_actions_menu.xml +++ b/owncloudApp/src/main/res/menu/file_actions_menu.xml @@ -23,13 +23,13 @@ + app:showAsAction="never" /> + app:showAsAction="never" />