Skip to content

Commit

Permalink
lint check
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesa2 committed Nov 28, 2019
1 parent fe4c3c0 commit 4c1c8c5
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 13 deletions.
12 changes: 3 additions & 9 deletions .gitignore
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/

# 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
*.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
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
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" />

</lint>
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
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
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

0 comments on commit 4c1c8c5

Please sign in to comment.