Merge pull request zhihu#19 from CoXier/master

A marginal improvement
lhn200835 · Apr 25, 2017 · 997fd46 · 997fd46
2 parents 6cb2a68 + 1a9b4b1
commit 997fd46
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,6 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
 /build
 /captures
@@ -25,12 +23,11 @@ bin/
 gen/
 out/
 
-# Gradle files
-.gradle/
-build/
+# Gradle build files
+matisse/build
+sample/build
+
 
-# Local configuration file (sdk path, etc)
-local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -44,8 +41,6 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# Intellij
-*.iml
 
 # Keystore files
 *.jks
diff --git a/matisse/src/main/java/com/zhihu/matisse/Matisse.java b/matisse/src/main/java/com/zhihu/matisse/Matisse.java
@@ -36,8 +36,7 @@ public final class Matisse {
     private final WeakReference<Fragment> mFragment;
 
     private Matisse(Activity activity) {
-        mContext = new WeakReference<>(activity);
-        mFragment = null;
+        this(activity, null);
     }
 
     private Matisse(Activity activity, Fragment fragment) {