优化:恢复初始设置增加二次确认(防止误操作),初始化操作包括:重置设置、删除发送通道、规则、日志

pull/86/head
pppscn 3 years ago
parent dbab4718e0
commit 066d410e88

@ -4,8 +4,11 @@ import android.annotation.SuppressLint;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.Log; import android.util.Log;
@ -17,9 +20,11 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.idormy.sms.forwarder.utils.CommonUtil; import com.idormy.sms.forwarder.utils.CommonUtil;
import com.idormy.sms.forwarder.utils.DbHelper;
import com.idormy.sms.forwarder.utils.KeepAliveUtils; import com.idormy.sms.forwarder.utils.KeepAliveUtils;
import com.idormy.sms.forwarder.utils.SettingUtil; import com.idormy.sms.forwarder.utils.SettingUtil;
@ -320,26 +325,34 @@ public class SettingActivity extends AppCompatActivity {
//恢复初始化配置 //恢复初始化配置
public void initSetting(View view) { public void initSetting(View view) {
EditText et_add_extra_device_mark = findViewById(R.id.et_add_extra_device_mark); AlertDialog.Builder builder = new AlertDialog.Builder(SettingActivity.this);
et_add_extra_device_mark.setText(""); builder.setTitle(R.string.init_setting);
editAddExtraDeviceMark(et_add_extra_device_mark); builder.setMessage(R.string.init_setting_tips);
EditText et_add_extra_sim1 = findViewById(R.id.et_add_extra_sim1); //添加AlertDialog.Builder对象的setPositiveButton()方法
et_add_extra_sim1.setText(""); builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
editAddExtraSim1(et_add_extra_sim1); //初始化配置
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
EditText et_add_extra_sim2 = findViewById(R.id.et_add_extra_sim2); SharedPreferences.Editor editor = preferences.edit();
et_add_extra_sim2.setText(""); editor.clear();
editAddExtraSim2(et_add_extra_sim2); editor.commit();
//初始化数据库
DbHelper dbHelper = new DbHelper(this);
SQLiteDatabase db = dbHelper.getReadableDatabase();
dbHelper.delCreateTable(db);
dbHelper.onCreate(db);
Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
});
@SuppressLint("UseSwitchCompatOrMaterialCode") Switch switch_sms_template = findViewById(R.id.switch_sms_template); //添加AlertDialog.Builder对象的setNegativeButton()方法
switch_sms_template.setChecked(false); builder.setNegativeButton(R.string.cancel, (dialog, which) -> {
switchSmsTemplate(switch_sms_template);
EditText textSmsTemplate = findViewById(R.id.text_sms_template); });
textSmsTemplate.setText("{{来源号码}}\n{{短信内容}}\n{{卡槽信息}}\n{{接收时间}}\n{{设备名称}}");
editSmsTemplate(textSmsTemplate);
builder.create().show();
} }
//电池优化设置 //电池优化设置

@ -179,6 +179,7 @@
<string name="insert_time">Time</string> <string name="insert_time">Time</string>
<string name="insert_device_name">Device</string> <string name="insert_device_name">Device</string>
<string name="init_setting">Restore initial Setting</string> <string name="init_setting">Restore initial Setting</string>
<string name="init_setting_tips">Are you sure you want to restore the initial configuration? \n\n[Warning] This operation will reset Settings, delete send channels, rules, logs!</string>
<string name="battery_setting">Battery Optimization</string> <string name="battery_setting">Battery Optimization</string>
<string name="request_permission">Request Notify Permission</string> <string name="request_permission">Request Notify Permission</string>
<string name="unknown_number">Unknown Number</string> <string name="unknown_number">Unknown Number</string>

@ -178,7 +178,8 @@
<string name="insert_extra">卡槽信息</string> <string name="insert_extra">卡槽信息</string>
<string name="insert_time">接收时间</string> <string name="insert_time">接收时间</string>
<string name="insert_device_name">设备名称</string> <string name="insert_device_name">设备名称</string>
<string name="init_setting">恢复默认配置</string> <string name="init_setting">恢复初始配置</string>
<string name="init_setting_tips">确定需要恢复初始配置吗?\n\n【警告】此操作将重置设置、删除发送通道、规则、日志</string>
<string name="battery_setting">设置电池优化</string> <string name="battery_setting">设置电池优化</string>
<string name="request_permission">请求通知权限</string> <string name="request_permission">请求通知权限</string>
<string name="unknown_number">未知号码</string> <string name="unknown_number">未知号码</string>

Loading…
Cancel
Save