diff --git a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java index 2029ab3e..474552a4 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java @@ -47,6 +47,7 @@ public class MainActivity extends AppCompatActivity implements ReFlashListView.I Log.d(TAG, "oncreate"); super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); //检查权限是否获取 checkPermission(); @@ -56,7 +57,6 @@ public class MainActivity extends AppCompatActivity implements ReFlashListView.I MyApplication.SimInfoList = PhoneUtils.getSimMultiInfo(); Log.d(TAG, "SimInfoList = " + MyApplication.SimInfoList); - setContentView(R.layout.activity_main); } @Override diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SendHistory.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SendHistory.java index a4f95547..66af28ee 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SendHistory.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SendHistory.java @@ -35,8 +35,6 @@ public class SendHistory { dbHelper = new DbHelper(context); db = dbHelper.getReadableDatabase(); } - - } public static void addHistory(String msg) { @@ -159,7 +157,6 @@ public class SendHistory { } cursor.close(); - SharedPreferences sp = context.getSharedPreferences(Define.SP_MSG, Context.MODE_PRIVATE); Set msg_set = new HashSet<>(); msg_set = sp.getStringSet(Define.SP_MSG_SET_KEY, msg_set); diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java index 9b4f96fa..a371420d 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java @@ -17,7 +17,6 @@ import com.idormy.sms.forwarder.model.vo.SmsVo; import com.idormy.sms.forwarder.model.vo.WebNotifySettingVo; import com.idormy.sms.forwarder.utils.LogUtil; import com.idormy.sms.forwarder.utils.RuleUtil; -import com.idormy.sms.forwarder.utils.SettingUtil; import java.util.List; @@ -31,21 +30,6 @@ import static com.idormy.sms.forwarder.model.SenderModel.TYPE_WEB_NOTIFY; public class SendUtil { private static String TAG = "SendUtil"; - public static void send_msg(String msg) { - if (SettingUtil.using_dingding()) { - try { - SenderDingdingMsg.sendMsg(msg); - } catch (Exception e) { - Log.d(TAG, "发送出错：" + e.getMessage()); - } - - } - if (SettingUtil.using_email()) { -// SenderMailMsg.send(SettingUtil.get_send_util_email(Define.SP_MSG_SEND_UTIL_EMAIL_TOADD_KEY),"转发",msg); - } - - } - public static void send_msg_list(Context context, List smsVoList) { Log.i(TAG, "send_msg_list size: " + smsVoList.size()); for (SmsVo smsVo : smsVoList) { diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderDingdingMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderDingdingMsg.java index 8065c01f..4f49bec2 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderDingdingMsg.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderDingdingMsg.java @@ -7,7 +7,6 @@ import android.util.Base64; import android.util.Log; import com.alibaba.fastjson.JSON; -import com.idormy.sms.forwarder.utils.SettingUtil; import java.io.IOException; import java.net.URLEncoder; @@ -33,54 +32,6 @@ public class SenderDingdingMsg { static String TAG = "SenderDingdingMsg"; - public static void sendMsg(String msg) throws Exception { - - String webhook_token = "https://oapi.dingtalk.com/robot/send?access_token=" + SettingUtil.get_using_dingding_token(); - String webhook_secret = SettingUtil.get_using_dingding_secret(); - if (webhook_token.equals("")) { - return; - } - if (!webhook_secret.equals("")) { - Long timestamp = System.currentTimeMillis(); - - String stringToSign = timestamp + "\n" + webhook_secret; - Mac mac = Mac.getInstance("HmacSHA256"); - mac.init(new SecretKeySpec(webhook_secret.getBytes("UTF-8"), "HmacSHA256")); - byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8")); - String sign = URLEncoder.encode(new String(Base64.encode(signData, Base64.NO_WRAP)), "UTF-8"); - webhook_token += "×tamp=" + timestamp + "&sign=" + sign; - Log.i(TAG, "webhook_token:" + webhook_token); - - } - - final String msgf = msg; - String textMsg = "{ \"msgtype\": \"text\", \"text\": {\"content\": \"" + msg + "\"}}"; - OkHttpClient client = new OkHttpClient(); - RequestBody requestBody = RequestBody.create(MediaType.parse("application/json;charset=utf-8"), - textMsg); - - final Request request = new Request.Builder() - .url(webhook_token) - .addHeader("Content-Type", "application/json; charset=utf-8") - .post(requestBody) - .build(); - Call call = client.newCall(request); - call.enqueue(new Callback() { - @Override - public void onFailure(Call call, IOException e) { - Log.d(TAG, "onFailure：" + e.getMessage()); - SendHistory.addHistory("钉钉转发:" + msgf + "onFailure：" + e.getMessage()); - } - - @Override - public void onResponse(Call call, Response response) throws IOException { - final String responseStr = response.body().string(); - Log.d(TAG, "Code：" + String.valueOf(response.code()) + responseStr); - SendHistory.addHistory("钉钉转发:" + msgf + "Code：" + String.valueOf(response.code()) + responseStr); - } - }); - } - public static void sendMsg(final Handler handError, String token, String secret, String atMobiles, Boolean atAll, String msg) throws Exception { Log.i(TAG, "sendMsg token:" + token + " secret:" + secret + " atMobiles:" + atMobiles + " atAll:" + atAll + " msg:" + msg); diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderQyWxAppMsg.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderQyWxAppMsg.java index 9b68fdc6..e1cfff45 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SenderQyWxAppMsg.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SenderQyWxAppMsg.java @@ -3,22 +3,16 @@ package com.idormy.sms.forwarder.sender; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.util.Base64; import android.util.Log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.idormy.sms.forwarder.MyApplication; -import com.idormy.sms.forwarder.utils.SettingUtil; import java.io.IOException; -import java.net.URLEncoder; import java.util.HashMap; import java.util.Map; -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; - import okhttp3.Call; import okhttp3.Callback; import okhttp3.MediaType; @@ -33,54 +27,6 @@ public class SenderQyWxAppMsg { static String TAG = "SenderQyWxAppMsg"; - public static void sendMsg(String msg) throws Exception { - - String webhook_token = "https://oapi.dingtalk.com/robot/send?access_token=" + SettingUtil.get_using_dingding_token(); - String webhook_secret = SettingUtil.get_using_dingding_secret(); - if (webhook_token.equals("")) { - return; - } - if (!webhook_secret.equals("")) { - Long timestamp = System.currentTimeMillis(); - - String stringToSign = timestamp + "\n" + webhook_secret; - Mac mac = Mac.getInstance("HmacSHA256"); - mac.init(new SecretKeySpec(webhook_secret.getBytes("UTF-8"), "HmacSHA256")); - byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8")); - String sign = URLEncoder.encode(new String(Base64.encode(signData, Base64.NO_WRAP)), "UTF-8"); - webhook_token += "×tamp=" + timestamp + "&sign=" + sign; - Log.i(TAG, "webhook_token:" + webhook_token); - - } - - final String msgf = msg; - String textMsg = "{ \"msgtype\": \"text\", \"text\": {\"content\": \"" + msg + "\"}}"; - OkHttpClient client = new OkHttpClient(); - RequestBody requestBody = RequestBody.create(MediaType.parse("application/json;charset=utf-8"), - textMsg); - - final Request request = new Request.Builder() - .url(webhook_token) - .addHeader("Content-Type", "application/json; charset=utf-8") - .post(requestBody) - .build(); - Call call = client.newCall(request); - call.enqueue(new Callback() { - @Override - public void onFailure(Call call, IOException e) { - Log.d(TAG, "onFailure：" + e.getMessage()); - SendHistory.addHistory("钉钉转发:" + msgf + "onFailure：" + e.getMessage()); - } - - @Override - public void onResponse(Call call, Response response) throws IOException { - final String responseStr = response.body().string(); - Log.d(TAG, "Code：" + String.valueOf(response.code()) + responseStr); - SendHistory.addHistory("钉钉转发:" + msgf + "Code：" + String.valueOf(response.code()) + responseStr); - } - }); - } - public static void sendMsg(final Handler handError, String corpID, String agentID, String secret, String toUser, String content, boolean forceRefresh) throws Exception { Log.i(TAG, "sendMsg corpID:" + corpID + " agentID:" + agentID + " secret:" + secret + " toUser:" + toUser + " content:" + content + " forceRefresh:" + forceRefresh); diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/Define.java b/app/src/main/java/com/idormy/sms/forwarder/utils/Define.java index 64ad7ef6..28c97b62 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/Define.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/Define.java @@ -3,7 +3,6 @@ package com.idormy.sms.forwarder.utils; public class Define { public static String SP_CONFIG = "forwarder_config"; public static String SP_CONFIG_SWITCH_HELP_TIP = "forwarder_config_switch_help_tip"; - public static String SP_CONFIG_SIM_INFO = "forwarder_config_sim_info"; public static String SP_MSG_KEY_SWITCH_ADD_EXTRA = "tsms_msg_key_switch_add_extra"; public static String SP_MSG_KEY_STRING_ADD_EXTRA_DEVICE_MARK = "tsms_msg_key_string_add_extra_device_mark"; @@ -14,9 +13,4 @@ public class Define { public static String SP_MSG = "forwarder_msg"; public static String SP_MSG_SET_KEY = "forwarder_msg_set_key"; - public static String SP_MSG_SEND_UTIL_EMAIL_HOST_KEY = "forwarder_msg_send_util_email_host_key"; - public static String SP_MSG_SEND_UTIL_EMAIL_PORT_KEY = "forwarder_msg_send_util_email_port_key"; - public static String SP_MSG_SEND_UTIL_EMAIL_FROMADD_KEY = "forwarder_msg_send_util_email_fromadd_key"; - public static String SP_MSG_SEND_UTIL_EMAIL_PSW_KEY = "forwarder_msg_send_util_email_psw_key"; - public static String SP_MSG_SEND_UTIL_EMAIL_TOADD_KEY = "forwarder_msg_send_util_email_toadd_key"; } diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java index 7d55ed4a..2b0da3b3 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java @@ -99,52 +99,6 @@ public class SettingUtil { .apply(); } - public static boolean option_withreboot() { - return sp_setting.getBoolean("option_withreboot", false); - } - - public static boolean using_dingding() { - return sp_setting.getBoolean("option_dingding_on", false); - } - - public static String get_using_dingding_token() { - return sp_setting.getString("option_dingding_token", ""); - } - - public static String get_using_dingding_secret() { - return sp_setting.getString("option_dingding_secret", ""); - } - - public static boolean using_email() { - return sp_setting.getBoolean("option_email_on", false); - } - - public static void set_send_util_email(String host, String port, String from_add, String psw, String to_add) { - Log.d(TAG, "set_send_util_email host:" + host + "port" + port + "from_add" + from_add + "psw" + psw + "to_add" + to_add); - //验证 - if (host.equals("") || port.equals("") || from_add.equals("") || psw.equals("") || to_add.equals("")) { - return; - } - sp_setting.edit() - .putString(Define.SP_MSG_SEND_UTIL_EMAIL_HOST_KEY, host) - .putString(Define.SP_MSG_SEND_UTIL_EMAIL_PORT_KEY, port) - .putString(Define.SP_MSG_SEND_UTIL_EMAIL_FROMADD_KEY, from_add) - .putString(Define.SP_MSG_SEND_UTIL_EMAIL_PSW_KEY, psw) - .putString(Define.SP_MSG_SEND_UTIL_EMAIL_TOADD_KEY, to_add) - .apply(); - } - - public static String get_send_util_email(String key) { - Log.d(TAG, "get_send_util_email key" + key); - String defaultstt = ""; - if (key.equals(Define.SP_MSG_SEND_UTIL_EMAIL_HOST_KEY)) defaultstt = "smtp服务器"; - if (key.equals(Define.SP_MSG_SEND_UTIL_EMAIL_PORT_KEY)) defaultstt = "端口"; - if (key.equals(Define.SP_MSG_SEND_UTIL_EMAIL_FROMADD_KEY)) defaultstt = "发送邮箱"; - if (key.equals(Define.SP_MSG_SEND_UTIL_EMAIL_PSW_KEY)) defaultstt = "密码"; - if (key.equals(Define.SP_MSG_SEND_UTIL_EMAIL_TOADD_KEY)) defaultstt = "接收邮箱"; - return sp_setting.getString(key, defaultstt); - } - public static boolean saveMsgHistory() { return sp_setting.getBoolean("option_save_history_on", false); } diff --git a/app/src/main/res/xml/preference_setting.xml b/app/src/main/res/xml/preference_setting.xml deleted file mode 100644 index 312fa12f..00000000 --- a/app/src/main/res/xml/preference_setting.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file