From b471085c2b2d6229bb6fb54a6d444802147a7392 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Sun, 1 Oct 2017 19:42:13 +0900 Subject: remove leakcanary for now --- .idea/kotlinc.xml | 7 ++++ app/app.iml | 44 ++++++++++++---------- app/build.gradle | 5 --- .../net/lacolaco/smileessence/Application.java | 15 -------- .../smileessence/activity/MainActivity.java | 35 ----------------- .../smileessence/view/SettingFragment.java | 6 --- .../view/dialog/StackableDialogFragment.java | 6 --- .../smileessence/view/page/PageFragment.java | 6 --- 8 files changed, 32 insertions(+), 92 deletions(-) create mode 100644 .idea/kotlinc.xml diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 00000000..d80eed3c --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 54fb7da4..e0ae65c6 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,7 +9,6 @@ + + + + + + + + + - + @@ -50,7 +66,6 @@ - @@ -58,7 +73,6 @@ - @@ -67,25 +81,22 @@ - - - - - - - - - - + + + + + + + @@ -109,7 +120,6 @@ - @@ -136,19 +146,15 @@ - - - - diff --git a/app/build.gradle b/app/build.gradle index 33051a39..fb3267ac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,11 +82,6 @@ dependencies { // guava compile 'com.google.guava:guava:19.0' - // LeakCanary - debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4' - releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4' - release2Compile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4' - // Fabric compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true; diff --git a/app/src/main/java/net/lacolaco/smileessence/Application.java b/app/src/main/java/net/lacolaco/smileessence/Application.java index 0b2b07ab..e46d31d6 100644 --- a/app/src/main/java/net/lacolaco/smileessence/Application.java +++ b/app/src/main/java/net/lacolaco/smileessence/Application.java @@ -28,20 +28,12 @@ import android.app.Activity; import android.os.Bundle; import com.crashlytics.android.Crashlytics; import com.crashlytics.android.core.CrashlyticsCore; -import com.squareup.haha.perflib.Main; -import com.squareup.leakcanary.LeakCanary; -import com.squareup.leakcanary.RefWatcher; import io.fabric.sdk.android.Fabric; import net.lacolaco.smileessence.activity.MainActivity; import net.lacolaco.smileessence.data.Account; import net.lacolaco.smileessence.data.OrmaHolder; import net.lacolaco.smileessence.logging.Logger; import net.lacolaco.smileessence.preference.UserPreferenceHelper; -import net.lacolaco.smileessence.util.UIHandler; - -import java.util.Collections; -import java.util.Set; -import java.util.WeakHashMap; /** * プロセスと同期しているオブジェクト @@ -52,7 +44,6 @@ public class Application extends android.app.Application { private static Application instance; private MainActivity lastUsedMainActivity; private int resId; - private RefWatcher refWatcher; @Override public void onCreate() { @@ -60,7 +51,6 @@ public class Application extends android.app.Application { Fabric.with(this, new Crashlytics.Builder().core(new CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()).build()); OrmaHolder.initialize(this); instance = this; // プロセスの寿命の間 1 度しか呼ばれないので安全 - refWatcher = LeakCanary.install(this); registerActivityLifecycleCallbacks(new ActivityLifeCycleListener()); Logger.debug("onCreate"); } @@ -104,11 +94,6 @@ public class Application extends android.app.Application { void onCurrentAccountChanged(Account newAccount); } - // --------------------- LeakCanary --------------------- - public RefWatcher getRefWatcher() { - return refWatcher; - } - private class ActivityLifeCycleListener implements ActivityLifecycleCallbacks { @Override public void onActivityCreated(Activity activity, Bundle savedInstanceState) { diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java index fef4e7e2..4e1b50e0 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java @@ -268,44 +268,9 @@ public class MainActivity extends Activity implements Application.OnCurrentAccou if (stream != null) { new Thread(stream::shutdown).start(); } - if (BuildConfig.DEBUG) fixIMMLeak(); // LeakCanary shows - fixCroutonLeak(); Logger.debug("onDestroy"); } - private void fixIMMLeak() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { - try { - Object imm = getSystemService(Context.INPUT_METHOD_SERVICE); - Field mCurRootView = imm.getClass().getDeclaredField("mCurRootView"); - mCurRootView.setAccessible(true); - mCurRootView.set(imm, null); - Field mServedView = imm.getClass().getDeclaredField("mServedView"); - mServedView.setAccessible(true); - mServedView.set(imm, null); - Field mNextServedView = imm.getClass().getDeclaredField("mNextServedView"); - mNextServedView.setAccessible(true); - mNextServedView.set(imm, null); - } catch (Exception e) { - Logger.debug("imm fix error: " + e); - } - } - } - - private void fixCroutonLeak() { - try { - Class klass = Class.forName("de.keyboardsurfer.android.widget.crouton.DefaultAnimationsBuilder"); - Field slideInDownAnimation = klass.getDeclaredField("slideInDownAnimation"); - slideInDownAnimation.setAccessible(true); - slideInDownAnimation.set(null, null); - Field slideOutUpAnimation = klass.getDeclaredField("slideOutUpAnimation"); - slideOutUpAnimation.setAccessible(true); - slideOutUpAnimation.set(null, null); - } catch (Exception e) { - Logger.error("crouton fix error: " + e); - } - } - @Override protected void onNewIntent(Intent intent) { IntentRouter.onNewIntent(this, intent); diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java index 6b198310..d9891a49 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java @@ -126,12 +126,6 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe sharedPreferences.registerOnSharedPreferenceChangeListener(this); } - @Override - public void onDestroy() { - super.onDestroy(); - Application.getInstance().getRefWatcher().watch(this); - } - // -------------------------- OTHER METHODS -------------------------- public Preference findPreference(int preferenceResID) { diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.java index 1fa5ff11..427c4884 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.java @@ -16,10 +16,4 @@ public class StackableDialogFragment extends DialogFragment { super.dismissAllowingStateLoss(); DialogHelper.unregisterDialog(getTag()); } - - @Override - public void onDestroy() { - super.onDestroy(); - Application.getInstance().getRefWatcher().watch(this); - } } diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.java index cd59854c..d9393ccd 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.java @@ -17,10 +17,4 @@ public abstract class PageFragment extends Fragment { } public abstract void refresh(); - - @Override - public void onDestroy() { - super.onDestroy(); - Application.getInstance().getRefWatcher().watch(this); - } } -- cgit v1.2.3