From 97f86a5d6d562b23d0a2c8a83eb3a86bd9b5b5fe Mon Sep 17 00:00:00 2001
From: chengyuhui <chengyuhui1@gmail.com>
Date: Thu, 4 Aug 2016 22:01:04 +0800
Subject: [PATCH] More logs & button detection

---
 .../java/moe/reimu/weiboxposed/Module.java    | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/moe/reimu/weiboxposed/Module.java b/app/src/main/java/moe/reimu/weiboxposed/Module.java
index ed02d4e..a4e7f04 100644
--- a/app/src/main/java/moe/reimu/weiboxposed/Module.java
+++ b/app/src/main/java/moe/reimu/weiboxposed/Module.java
@@ -24,6 +24,7 @@
 import de.robv.android.xposed.callbacks.XC_InitPackageResources.InitPackageResourcesParam;
 import de.robv.android.xposed.callbacks.XC_LoadPackage;
 
+import static de.robv.android.xposed.XposedBridge.log;
 import static de.robv.android.xposed.XposedHelpers.findAndHookMethod;
 import static de.robv.android.xposed.XposedHelpers.getObjectField;
 
@@ -48,7 +49,7 @@ public void initZygote(StartupParam startupParam) throws Throwable {
 		prefs = new XSharedPreferences(MOD_PACKAGE_NAME, SettingsActivity.PREF_NAME);
 		prefs.makeWorldReadable();
 
-		XposedBridge.log("[WeiboXposed] Pref Init.");
+		log("[WeiboXposed] Pref Init.");
 	}
 
 	@Override
@@ -70,14 +71,26 @@ private void hookSelf(final XC_LoadPackage.LoadPackageParam lpparam) {
 
 	public boolean isPromotion(Object mblog) {
 		try {
+			Object buttons = getObjectField(mblog, "buttons");
 			Object promotion = getObjectField(mblog, "promotion");
 
+			String scheme = (String)getObjectField(mblog, "scheme");
+
+			if (buttons != null) {
+				log("[WeiboXposed] " + scheme + " detected as promotion: buttons");
+				return true;
+			}
+
 			if (promotion != null) {
 				String adType = (String)getObjectField(promotion, "adtype");
-				return !"8".equals(adType);
+				if (!"8".equals(adType)) {
+					log("[WeiboXposed] " + scheme + " detected as promotion: adtype");
+					return true;
+				}
 			}
+
 		} catch(NoSuchFieldError e) {
-			return false;
+			log("[WiboXposed] " + e.getMessage());
 		}
 
 		return false;
@@ -86,8 +99,8 @@ public boolean isPromotion(Object mblog) {
 	private void hookWeibo(final XC_LoadPackage.LoadPackageParam lpparam) {
 		prefs.reload();
 		boolean useExpMethod = prefs.getBoolean("switch_remove_mode", false);
-		XposedBridge.log("[WeiboXposed] App Weibo Loaded");
-		XposedBridge.log("[WeiboXposed] Remove Mode: " + useExpMethod);
+		log("[WeiboXposed] App Weibo Loaded");
+		log("[WeiboXposed] Remove Mode: " + useExpMethod);
 
 		XC_MethodHook callbackCancel = new XC_MethodHook() {
 			@Override
@@ -117,7 +130,9 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 
 				for (Object mblog :
 						origResult) {
-					if (isPromotion(mblog)) continue;
+					if (isPromotion(mblog)) {
+						log("[WeiboXposed][DATA] Removing promotion.");
+					}
 					result.add(mblog);
 				}
 
@@ -143,7 +158,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 				}
 
 				if (isPromotion(status)) {
-					XposedBridge.log("[WeiboXposed] Removing #" + getObjectField(status, "id"));
+					log("[WeiboXposed][VIEW] Removing promotion.");
 					TextView tv = new TextView(AndroidAppHelper.currentApplication()); // Empty view
 					param.setResult(tv);
 				}