Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lint check #2736

Closed
wants to merge 1 commit into from
Closed

lint check #2736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,11 @@
# Java class files
*.class

# generated files
bin/
build/
*.iml
gen/
target/

abelgardep marked this conversation as resolved.
Show resolved Hide resolved
# 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
Expand All @@ -33,13 +25,15 @@ tests/proguard-project.txt

# Android Studio and Gradle specific entries
.gradle
.idea
abelgardep marked this conversation as resolved.
Show resolved Hide resolved
*.iml
build

# android sdk captures folder
captures

# ignore lint html and xml output
lint-*ml

!.idea/
.idea/*
!.idea/codeStyles/
Expand Down
7 changes: 5 additions & 2 deletions owncloudApp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,11 @@ android {
}

lintOptions {
abortOnError false
disable 'MissingTranslation'
abortOnError true
ignoreWarnings false

xmlReport false
htmlOutput file("../lint-app-report.html")
}

packagingOptions {
Expand Down
7 changes: 7 additions & 0 deletions owncloudApp/lint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue id="WrongConstant" severity="ignore" />
<issue id="MissingTranslation" severity="ignore" />
<issue id="ByteOrderMark" severity="ignore" />
abelgardep marked this conversation as resolved.
Show resolved Hide resolved

</lint>
1 change: 1 addition & 0 deletions owncloudApp/src/main/java/com/owncloud/android/shares/presentation/ShareActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
4 changes: 2 additions & 2 deletions owncloudApp/src/main/res/menu/file_actions_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
<item
android:id="@+id/file_action_select_all"
android:title="@string/actionbar_select_all"
android:showAsAction="never" />
app:showAsAction="never" />

<item
android:id="@+id/action_select_inverse"
android:title="@string/actionbar_select_inverse"
android:visible="true"
android:showAsAction="never" />
app:showAsAction="never" />

<item
android:id="@+id/action_share_file"
Expand Down