diff --git a/app/src/main/java/eu/faircode/netguard/ActivityDns.java b/app/src/main/java/eu/faircode/netguard/ActivityDns.java
index e102ed9e7..69a4e414d 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivityDns.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivityDns.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ActivityForwardApproval.java b/app/src/main/java/eu/faircode/netguard/ActivityForwardApproval.java
index b7066c52e..52be38cc4 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivityForwardApproval.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivityForwardApproval.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java b/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java
index c16dfdc5f..3575593c7 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ActivityLog.java b/app/src/main/java/eu/faircode/netguard/ActivityLog.java
index 2c87d6e1a..8c43ae018 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivityLog.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivityLog.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java
index cff8a1efc..e9ee8a253 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
@@ -102,6 +102,7 @@
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
public class ActivityMain extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "TrackerControl.Main";
@@ -186,6 +187,7 @@ protected void onCreate(Bundle savedInstanceState) {
Log.i(TAG, "SDK=" + Build.VERSION.SDK_INT);
super.onCreate(savedInstanceState);
setContentView(R.layout.android);
+ setCopyright(findViewById(android.R.id.content));
return;
}
@@ -194,6 +196,7 @@ protected void onCreate(Bundle savedInstanceState) {
Log.i(TAG, "Xposed running");
super.onCreate(savedInstanceState);
setContentView(R.layout.xposed);
+ setCopyright(findViewById(android.R.id.content));
return;
}
@@ -1559,10 +1562,19 @@ public void onDismiss(DialogInterface dialogInterface) {
dialogLegend.show();
}
+ private void setCopyright(View view) {
+ TextView tvCopyright = view.findViewById(R.id.tvCopyright);
+ if (tvCopyright != null)
+ tvCopyright.setText(getString(R.string.app_copyright).replaceFirst(
+ "(?<=2019[–-])20\\d{2}",
+ new SimpleDateFormat("yyyy", Locale.US).format(new Date())));
+ }
+
private void menu_about() {
// Create view
LayoutInflater inflater = LayoutInflater.from(this);
View view = inflater.inflate(R.layout.about, null, false);
+ setCopyright(view);
TextView tvVersionName = view.findViewById(R.id.tvVersionName);
TextView tvVersionCode = view.findViewById(R.id.tvVersionCode);
Button btnRate = view.findViewById(R.id.btnRate);
diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
index 7f946d256..3b482410a 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/AdapterAccess.java b/app/src/main/java/eu/faircode/netguard/AdapterAccess.java
index f89ce90d2..7abb959bc 100644
--- a/app/src/main/java/eu/faircode/netguard/AdapterAccess.java
+++ b/app/src/main/java/eu/faircode/netguard/AdapterAccess.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/AdapterDns.java b/app/src/main/java/eu/faircode/netguard/AdapterDns.java
index d0ccbfedb..739ea250c 100644
--- a/app/src/main/java/eu/faircode/netguard/AdapterDns.java
+++ b/app/src/main/java/eu/faircode/netguard/AdapterDns.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/AdapterForwarding.java b/app/src/main/java/eu/faircode/netguard/AdapterForwarding.java
index f0da5b7e8..a8302162b 100644
--- a/app/src/main/java/eu/faircode/netguard/AdapterForwarding.java
+++ b/app/src/main/java/eu/faircode/netguard/AdapterForwarding.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/AdapterLog.java b/app/src/main/java/eu/faircode/netguard/AdapterLog.java
index 681f83644..adcd586ca 100644
--- a/app/src/main/java/eu/faircode/netguard/AdapterLog.java
+++ b/app/src/main/java/eu/faircode/netguard/AdapterLog.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/AdapterRule.java b/app/src/main/java/eu/faircode/netguard/AdapterRule.java
index 2b561775d..8568f4ca4 100644
--- a/app/src/main/java/eu/faircode/netguard/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/netguard/AdapterRule.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/Allowed.java b/app/src/main/java/eu/faircode/netguard/Allowed.java
index b640a3084..fc84dd7bf 100644
--- a/app/src/main/java/eu/faircode/netguard/Allowed.java
+++ b/app/src/main/java/eu/faircode/netguard/Allowed.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2020 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ApplicationEx.java b/app/src/main/java/eu/faircode/netguard/ApplicationEx.java
index 7ed543da1..9e6e281e1 100644
--- a/app/src/main/java/eu/faircode/netguard/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/netguard/ApplicationEx.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ApplicationExFilter.java b/app/src/main/java/eu/faircode/netguard/ApplicationExFilter.java
index f22d2c24f..dc48cb5c6 100644
--- a/app/src/main/java/eu/faircode/netguard/ApplicationExFilter.java
+++ b/app/src/main/java/eu/faircode/netguard/ApplicationExFilter.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2022 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/DatabaseHelper.java b/app/src/main/java/eu/faircode/netguard/DatabaseHelper.java
index 52f84153e..0dfcf7e4f 100644
--- a/app/src/main/java/eu/faircode/netguard/DatabaseHelper.java
+++ b/app/src/main/java/eu/faircode/netguard/DatabaseHelper.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ExpandedListView.java b/app/src/main/java/eu/faircode/netguard/ExpandedListView.java
index f9d571185..520136f2a 100644
--- a/app/src/main/java/eu/faircode/netguard/ExpandedListView.java
+++ b/app/src/main/java/eu/faircode/netguard/ExpandedListView.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/Forward.java b/app/src/main/java/eu/faircode/netguard/Forward.java
index 141e0ef43..f46ecd8c4 100644
--- a/app/src/main/java/eu/faircode/netguard/Forward.java
+++ b/app/src/main/java/eu/faircode/netguard/Forward.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2020 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/FragmentSettings.java b/app/src/main/java/eu/faircode/netguard/FragmentSettings.java
index 4d9fa7595..0d305ae0e 100644
--- a/app/src/main/java/eu/faircode/netguard/FragmentSettings.java
+++ b/app/src/main/java/eu/faircode/netguard/FragmentSettings.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/GlideHelper.java b/app/src/main/java/eu/faircode/netguard/GlideHelper.java
index ae0873290..93bd9cadc 100644
--- a/app/src/main/java/eu/faircode/netguard/GlideHelper.java
+++ b/app/src/main/java/eu/faircode/netguard/GlideHelper.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/HostsDownloadWorker.java b/app/src/main/java/eu/faircode/netguard/HostsDownloadWorker.java
index b5271c3e0..0bad9a801 100644
--- a/app/src/main/java/eu/faircode/netguard/HostsDownloadWorker.java
+++ b/app/src/main/java/eu/faircode/netguard/HostsDownloadWorker.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/IPUtil.java b/app/src/main/java/eu/faircode/netguard/IPUtil.java
index 52c74ca6d..4971d650b 100644
--- a/app/src/main/java/eu/faircode/netguard/IPUtil.java
+++ b/app/src/main/java/eu/faircode/netguard/IPUtil.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2020 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/Packet.java b/app/src/main/java/eu/faircode/netguard/Packet.java
index c2a023b06..f15b99eb3 100644
--- a/app/src/main/java/eu/faircode/netguard/Packet.java
+++ b/app/src/main/java/eu/faircode/netguard/Packet.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2020 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ReceiverAutostart.java b/app/src/main/java/eu/faircode/netguard/ReceiverAutostart.java
index 9d368eb48..cd27045f7 100644
--- a/app/src/main/java/eu/faircode/netguard/ReceiverAutostart.java
+++ b/app/src/main/java/eu/faircode/netguard/ReceiverAutostart.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ReceiverPackageRemoved.java b/app/src/main/java/eu/faircode/netguard/ReceiverPackageRemoved.java
index ac0d110b4..ed1f50b05 100644
--- a/app/src/main/java/eu/faircode/netguard/ReceiverPackageRemoved.java
+++ b/app/src/main/java/eu/faircode/netguard/ReceiverPackageRemoved.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ResourceRecord.java b/app/src/main/java/eu/faircode/netguard/ResourceRecord.java
index 5d710e161..af5a877b0 100644
--- a/app/src/main/java/eu/faircode/netguard/ResourceRecord.java
+++ b/app/src/main/java/eu/faircode/netguard/ResourceRecord.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2020 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/Rule.java b/app/src/main/java/eu/faircode/netguard/Rule.java
index 85a18c27e..dcd75a191 100644
--- a/app/src/main/java/eu/faircode/netguard/Rule.java
+++ b/app/src/main/java/eu/faircode/netguard/Rule.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ServiceExternal.java b/app/src/main/java/eu/faircode/netguard/ServiceExternal.java
index 6564e1360..46d2d8730 100644
--- a/app/src/main/java/eu/faircode/netguard/ServiceExternal.java
+++ b/app/src/main/java/eu/faircode/netguard/ServiceExternal.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
index 6ded0e183..fb4df5a07 100644
--- a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
+++ b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/ServiceTileMain.java b/app/src/main/java/eu/faircode/netguard/ServiceTileMain.java
index dd20be7a1..67d4a97f1 100644
--- a/app/src/main/java/eu/faircode/netguard/ServiceTileMain.java
+++ b/app/src/main/java/eu/faircode/netguard/ServiceTileMain.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/SwitchPreference.java b/app/src/main/java/eu/faircode/netguard/SwitchPreference.java
index bd87806d1..a5129c40a 100644
--- a/app/src/main/java/eu/faircode/netguard/SwitchPreference.java
+++ b/app/src/main/java/eu/faircode/netguard/SwitchPreference.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/Usage.java b/app/src/main/java/eu/faircode/netguard/Usage.java
index 0253d8b6a..adf6f35f8 100644
--- a/app/src/main/java/eu/faircode/netguard/Usage.java
+++ b/app/src/main/java/eu/faircode/netguard/Usage.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2020 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/Util.java b/app/src/main/java/eu/faircode/netguard/Util.java
index 42bd1b4d5..ef2a16610 100644
--- a/app/src/main/java/eu/faircode/netguard/Util.java
+++ b/app/src/main/java/eu/faircode/netguard/Util.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/WidgetAdmin.java b/app/src/main/java/eu/faircode/netguard/WidgetAdmin.java
index 1a89131b6..75ab9ca3e 100644
--- a/app/src/main/java/eu/faircode/netguard/WidgetAdmin.java
+++ b/app/src/main/java/eu/faircode/netguard/WidgetAdmin.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/eu/faircode/netguard/WidgetMain.java b/app/src/main/java/eu/faircode/netguard/WidgetMain.java
index 8c3c22f0a..dea7fd60f 100644
--- a/app/src/main/java/eu/faircode/netguard/WidgetMain.java
+++ b/app/src/main/java/eu/faircode/netguard/WidgetMain.java
@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see .
*
- * Copyright © 2015–2020 by Marcel Bokhorst (M66B), Konrad
- * Kollnig (University of Oxford)
+ * Copyright © 2015–2020 Marcel Bokhorst (M66B)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package eu.faircode.netguard;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/Common.kt b/app/src/main/java/net/kollnig/missioncontrol/Common.kt
index e39226c2d..d1e337cbf 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/Common.kt
+++ b/app/src/main/java/net/kollnig/missioncontrol/Common.kt
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol
diff --git a/app/src/main/java/net/kollnig/missioncontrol/DetailsActivity.java b/app/src/main/java/net/kollnig/missioncontrol/DetailsActivity.java
index bfc76334e..d8a01b1ac 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/DetailsActivity.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/DetailsActivity.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/DetailsStateAdapter.java b/app/src/main/java/net/kollnig/missioncontrol/DetailsStateAdapter.java
index d5e8eb6f2..4f9779c68 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/DetailsStateAdapter.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/DetailsStateAdapter.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2022 Konrad Kollnig
*/
package net.kollnig.missioncontrol;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/InsightsActivity.kt b/app/src/main/java/net/kollnig/missioncontrol/InsightsActivity.kt
index b881fdff7..f76ed15de 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/InsightsActivity.kt
+++ b/app/src/main/java/net/kollnig/missioncontrol/InsightsActivity.kt
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol
diff --git a/app/src/main/java/net/kollnig/missioncontrol/analysis/AnalysisException.java b/app/src/main/java/net/kollnig/missioncontrol/analysis/AnalysisException.java
index 2534a270e..b67309af5 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/analysis/AnalysisException.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/analysis/AnalysisException.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2021 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2022 Konrad Kollnig
*/
package net.kollnig.missioncontrol.analysis;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/analysis/AnalysisProgressCallback.java b/app/src/main/java/net/kollnig/missioncontrol/analysis/AnalysisProgressCallback.java
index 7e706e896..af492e52f 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/analysis/AnalysisProgressCallback.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/analysis/AnalysisProgressCallback.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2021 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.analysis;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/analysis/SignatureTrie.java b/app/src/main/java/net/kollnig/missioncontrol/analysis/SignatureTrie.java
index 97046f819..053e71612 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/analysis/SignatureTrie.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/analysis/SignatureTrie.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2021 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.analysis;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerAnalysisManager.java b/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerAnalysisManager.java
index 62d160355..79d35c33c 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerAnalysisManager.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerAnalysisManager.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2021 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.analysis;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerAnalysisWorker.java b/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerAnalysisWorker.java
index 75b613123..8cebaf738 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerAnalysisWorker.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerAnalysisWorker.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2021 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.analysis;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerLibraryAnalyser.java b/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerLibraryAnalyser.java
index 682be87e8..b5a71588a 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerLibraryAnalyser.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/analysis/TrackerLibraryAnalyser.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2021 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.analysis;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/BlockingMode.java b/app/src/main/java/net/kollnig/missioncontrol/data/BlockingMode.java
index 550fe8f42..c1b84658b 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/BlockingMode.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/BlockingMode.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/InsightsData.kt b/app/src/main/java/net/kollnig/missioncontrol/data/InsightsData.kt
index 2095de999..12af4fde1 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/InsightsData.kt
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/InsightsData.kt
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/InsightsDataProvider.kt b/app/src/main/java/net/kollnig/missioncontrol/data/InsightsDataProvider.kt
index 945e7b345..cdbc5f4a5 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/InsightsDataProvider.kt
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/InsightsDataProvider.kt
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/InternetBlocklist.java b/app/src/main/java/net/kollnig/missioncontrol/data/InternetBlocklist.java
index 0aa798529..87458b137 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/InternetBlocklist.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/InternetBlocklist.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/PackageUids.java b/app/src/main/java/net/kollnig/missioncontrol/data/PackageUids.java
index 29b263c4b..1f76bc659 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/PackageUids.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/PackageUids.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/Pair.java b/app/src/main/java/net/kollnig/missioncontrol/data/Pair.java
index be21d29ba..7f47dada5 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/Pair.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/Pair.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2022 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/PlayStore.java b/app/src/main/java/net/kollnig/missioncontrol/data/PlayStore.java
index 4820eb469..604166575 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/PlayStore.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/PlayStore.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2022 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/Tracker.java b/app/src/main/java/net/kollnig/missioncontrol/data/Tracker.java
index f6e172330..3e1c79ff2 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/Tracker.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/Tracker.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/TrackerBlocklist.java b/app/src/main/java/net/kollnig/missioncontrol/data/TrackerBlocklist.java
index c3c16ebf0..e89bffc74 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/TrackerBlocklist.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/TrackerBlocklist.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/TrackerCategory.java b/app/src/main/java/net/kollnig/missioncontrol/data/TrackerCategory.java
index 14c082c94..031dc6f9f 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/TrackerCategory.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/TrackerCategory.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/TrackerList.java b/app/src/main/java/net/kollnig/missioncontrol/data/TrackerList.java
index 80a16ccac..17b27684e 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/TrackerList.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/TrackerList.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/UidKeyedStore.java b/app/src/main/java/net/kollnig/missioncontrol/data/UidKeyedStore.java
index a34895fae..eb96dbb25 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/data/UidKeyedStore.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/data/UidKeyedStore.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.data;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/details/ActionsFragment.java b/app/src/main/java/net/kollnig/missioncontrol/details/ActionsFragment.java
index 2f959a764..be8a01372 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/details/ActionsFragment.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/details/ActionsFragment.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.details;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/details/CountriesFragment.java b/app/src/main/java/net/kollnig/missioncontrol/details/CountriesFragment.java
index cedc707d0..e3e21c0b7 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/details/CountriesFragment.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/details/CountriesFragment.java
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with TrackerControl. If not, see .
*
- * Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ * Copyright © 2019–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.details;
diff --git a/app/src/main/java/net/kollnig/missioncontrol/dns/DnsProxyServer.java b/app/src/main/java/net/kollnig/missioncontrol/dns/DnsProxyServer.java
index 4b410d973..f006e8922 100644
--- a/app/src/main/java/net/kollnig/missioncontrol/dns/DnsProxyServer.java
+++ b/app/src/main/java/net/kollnig/missioncontrol/dns/DnsProxyServer.java
@@ -4,7 +4,7 @@
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * Copyright © 2024 Konrad Kollnig (University of Oxford)
+ * Copyright © 2024–2026 Konrad Kollnig
*/
package net.kollnig.missioncontrol.dns;
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 543399b17..ab4bdd1c9 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -75,6 +75,7 @@
diff --git a/app/src/main/res/layout/android.xml b/app/src/main/res/layout/android.xml
index 7a4afbb37..eb6008205 100644
--- a/app/src/main/res/layout/android.xml
+++ b/app/src/main/res/layout/android.xml
@@ -44,6 +44,7 @@
diff --git a/app/src/main/res/layout/forward.xml b/app/src/main/res/layout/forward.xml
index ad37563b7..da5a48c68 100644
--- a/app/src/main/res/layout/forward.xml
+++ b/app/src/main/res/layout/forward.xml
@@ -13,7 +13,7 @@
~ You should have received a copy of the GNU General Public License
~ along with TrackerControl. If not, see .
~
- ~ Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ ~ Copyright © 2019–2020 Konrad Kollnig
-->
.
~
- ~ Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ ~ Copyright © 2019–2026 Konrad Kollnig
-->
.
~
- ~ Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ ~ Copyright © 2019–2026 Konrad Kollnig
-->
.
~
- ~ Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ ~ Copyright © 2019–2020 Konrad Kollnig
-->
diff --git a/app/src/main/res/menu/forward.xml b/app/src/main/res/menu/forward.xml
index ecf47afbd..f43fe6748 100644
--- a/app/src/main/res/menu/forward.xml
+++ b/app/src/main/res/menu/forward.xml
@@ -13,7 +13,7 @@
~ You should have received a copy of the GNU General Public License
~ along with TrackerControl. If not, see .
~
- ~ Copyright © 2019–2020 Konrad Kollnig (University of Oxford)
+ ~ Copyright © 2019–2020 Konrad Kollnig
-->