Skip to content

Commit 1bc68d0

Browse files
committed
AppFilter: update
1 parent cb08d9d commit 1bc68d0

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

app/src/main/java/org/itxtech/daedalus/activity/AppFilterActivity.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
* (at your option) any later version.
4141
*/
4242
public class AppFilterActivity extends AppCompatActivity {
43-
4443
private RecyclerViewAdapter adapter;
4544

4645
@Override
@@ -78,7 +77,7 @@ public void onResume() {
7877
adapter.notifyDataSetChanged();
7978
}
8079

81-
private class AppObject {
80+
private static class AppObject {
8281
private String appName;
8382
private String appPackageName;
8483
private Drawable appIcon;
@@ -111,13 +110,11 @@ private class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewHolde
111110

112111
void updateList(ArrayList<AppObject> appObjects) {
113112
appList = appObjects;
114-
115113
for (int i = 0; i < appObjects.size(); i++) {
116114
if (Daedalus.configurations.getAppObjects().contains(appObjects.get(i).appPackageName)) {
117115
checkStatus.put(i, true);
118116
}
119117
}
120-
121118
runOnUiThread(this::notifyDataSetChanged);
122119
}
123120

@@ -158,7 +155,7 @@ public int getItemCount() {
158155
}
159156
}
160157

161-
private class RecyclerViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
158+
private static class RecyclerViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
162159
private ImageView appIcon;
163160
private TextView appName;
164161
private CheckBox appCheck;
@@ -172,7 +169,6 @@ private class RecyclerViewHolder extends RecyclerView.ViewHolder implements View
172169
itemView.setOnClickListener(this);
173170
}
174171

175-
176172
@Override
177173
public void onClick(View v) {
178174
if (appCheck.isChecked()) {

app/src/main/java/org/itxtech/daedalus/fragment/DnsTestFragment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ public void run() {
151151
}
152152
}
153153

154-
155154
private StringBuilder testServer(DnsQuery dnsQuery, Record.TYPE type, AbstractDnsServer server, String domain, StringBuilder testText) {
156155
Logger.debug("Testing DNS server " + server.getRealName());
157156
testText.append(getString(R.string.test_domain)).append(" ").append(domain).append("\n")

app/src/main/java/org/itxtech/daedalus/provider/ProviderPicker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* the Free Software Foundation, either version 3 of the License, or
1616
* (at your option) any later version.
1717
*/
18-
public class ProviderPicker {
18+
public abstract class ProviderPicker {
1919
public static final int DNS_QUERY_METHOD_UDP = 0;
2020
public static final int DNS_QUERY_METHOD_TCP = 1;
2121
public static final int DNS_QUERY_METHOD_TLS = 2;

app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void onReceive(Context context, Intent intent) {
9191
}
9292
}
9393

94-
public static void updateUpstreamServers(Context context) {
94+
private static void updateUpstreamServers(Context context) {
9595
String[] servers = DnsServersDetector.getServers(context);
9696
if (servers != null) {
9797
if (servers.length >= 2 && (aliasPrimary == null || !aliasPrimary.getHostAddress().equals(servers[0])) &&
@@ -197,6 +197,7 @@ public void onDestroy() {
197197
stopThread();
198198
if (receiver != null) {
199199
unregisterReceiver(receiver);
200+
receiver = null;
200201
}
201202
}
202203

0 commit comments

Comments
 (0)