清理无用代码
This commit is contained in:
parent
506533d251
commit
f01a15b2a0
|
@ -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
|
||||
|
|
|
@ -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<String> msg_set = new HashSet<>();
|
||||
msg_set = sp.getStringSet(Define.SP_MSG_SET_KEY, msg_set);
|
||||
|
|
|
@ -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<SmsVo> smsVoList) {
|
||||
Log.i(TAG, "send_msg_list size: " + smsVoList.size());
|
||||
for (SmsVo smsVo : smsVoList) {
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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";
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -1,82 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<PreferenceCategory android:title="转发设置">
|
||||
|
||||
<SwitchPreference
|
||||
android:checked="false"
|
||||
android:key="option_dingding_on"
|
||||
android:summary="使用钉钉转发短信"
|
||||
android:summaryOff="关闭钉钉转发"
|
||||
android:summaryOn="开启钉钉转发"
|
||||
android:title="钉钉转发" />
|
||||
|
||||
<EditTextPreference
|
||||
android:dependency="option_dingding_on"
|
||||
android:dialogIcon="@mipmap/dingding"
|
||||
android:key="option_dingding_token"
|
||||
android:summary="钉钉token"
|
||||
android:title="设置钉钉机器人token" />
|
||||
|
||||
<EditTextPreference
|
||||
android:dependency="option_dingding_on"
|
||||
android:dialogIcon="@mipmap/dingding"
|
||||
android:key="option_dingding_secret"
|
||||
android:summary="钉钉 加签"
|
||||
android:title="设置钉钉机器人secret" />
|
||||
|
||||
<SwitchPreference
|
||||
android:checked="false"
|
||||
android:key="option_email_on"
|
||||
android:summary="使用邮箱转发短信"
|
||||
android:summaryOff="关闭邮箱转发"
|
||||
android:summaryOn="开启邮箱转发"
|
||||
android:title="邮箱转发" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="自启动设置">
|
||||
<SwitchPreference
|
||||
android:checked="false"
|
||||
android:key="option_withreboot"
|
||||
android:summary="这是选项跟随系统自启"
|
||||
android:summaryOff="不跟随系统自启"
|
||||
android:summaryOn="跟随系统自启"
|
||||
android:title="自启动" />
|
||||
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="历史记录设置">
|
||||
<SwitchPreference
|
||||
android:checked="true"
|
||||
android:defaultValue="true"
|
||||
android:key="option_save_history_on"
|
||||
android:summary="这是选项保存转发记录"
|
||||
android:summaryOff="不保存转发记录"
|
||||
android:summaryOn="保存转发记录"
|
||||
android:title="保存转发记录" />
|
||||
<EditTextPreference
|
||||
android:dependency="option_save_history_on"
|
||||
android:hint="100"
|
||||
android:inputType="number"
|
||||
android:key="option_save_history_num"
|
||||
android:summary="保存转发历史条数"
|
||||
android:title="设置保存转发历史条数" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="版本管理">
|
||||
<SwitchPreference
|
||||
android:checked="true"
|
||||
android:key="option_version_check_on"
|
||||
android:summary="自动检查新版本"
|
||||
android:summaryOff="不自动检查新版本"
|
||||
android:summaryOn="自动检查新版本"
|
||||
android:title="检查新版本" />
|
||||
<Preference
|
||||
android:key="option_versionnow"
|
||||
android:title="版本" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
</PreferenceScreen>
|
Loading…
Reference in New Issue