Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ActivityDns.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ActivityLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
16 changes: 14 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ActivityMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ActivitySettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/AdapterAccess.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/AdapterDns.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/AdapterForwarding.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/AdapterLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/AdapterRule.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/Allowed.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ApplicationEx.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/DatabaseHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ExpandedListView.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/Forward.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/FragmentSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/GlideHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/IPUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/Packet.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ReceiverAutostart.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ResourceRecord.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/Rule.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ServiceExternal.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ServiceTileMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/SwitchPreference.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/Usage.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
*
* 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;
Expand Down
Loading
Loading