Skip to content

Commit

Permalink
Bug fixing. Code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
mauriciotogneri committed Aug 29, 2016
1 parent 1f98eba commit c1a0735
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 30 deletions.
16 changes: 0 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
#built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
bin/
gen/
Expand All @@ -18,18 +8,12 @@ gradle.properties

# Android Studio
/.idea
.idea
**/*.iml
*.iml
/.idea/workspace.xml
/.idea/libraries
/captures

# OSX files
.DS_Store

# Ignore gradle files
.gradle
/build
/app/build
**/build
1 change: 0 additions & 1 deletion app/.gitignore

This file was deleted.

14 changes: 6 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ apply plugin: 'com.android.application'
android
{
compileSdkVersion 24
buildToolsVersion "24"
buildToolsVersion "24.0.2"

defaultConfig
{
applicationId "com.mauriciotogneri.fileexplorer"
minSdkVersion 14
targetSdkVersion 22
versionCode 4
versionName "1.0.4"
targetSdkVersion 24
versionCode 5
versionName "1.0.5"
}

signingConfigs
Expand Down Expand Up @@ -42,9 +42,7 @@ android

dependencies
{
compile 'com.android.support:support-v4:24.0.0'

compile 'com.android.support:design:24.0.0'

compile 'com.android.support:support-v4:24.2.0'
compile 'com.android.support:design:24.2.0'
compile 'ch.acra:acra:4.9.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l

public synchronized boolean onBackPressed()
{
if (adapter.isSelectionMode())
if ((adapter != null) && adapter.isSelectionMode())
{
adapter.unselectAll();
updateButtonBar();
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript

dependencies
{
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.1.3'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Dec 28 10:00:20 PST 2015
#Mon Aug 29 20:56:08 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
1 change: 0 additions & 1 deletion tools/.gitignore

This file was deleted.

0 comments on commit c1a0735

Please sign in to comment.