Skip to content

Commit

Permalink
Renamed namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
kleest authored and roussosalex committed May 3, 2019
1 parent e4fddbe commit 84745cd
Show file tree
Hide file tree
Showing 73 changed files with 253 additions and 260 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ android {
compileSdkVersion 27

defaultConfig {
applicationId "tud.seemuh.nfcgate"
applicationId "de.tu_darmstadt.seemoo.nfcgate"
minSdkVersion 19
targetSdkVersion 27
versionCode 3
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="tud.seemuh.nfcgate" >
package="de.tu_darmstadt.seemoo.nfcgate" >

<uses-permission
android:name="android.permission.NFC"
Expand Down Expand Up @@ -44,8 +44,8 @@
android:configChanges="keyboardHidden|orientation|screenSize|screenLayout">

<intent-filter>
<action android:name="tud.seemuh.nfcgate.main" />
<action android:name="tud.seemuh.nfcgate.capture" />
<action android:name="de.tu_darmstadt.seemoo.nfcgate.main" />
<action android:name="de.tu_darmstadt.seemoo.nfcgate.capture" />
<action android:name="android.intent.action.MAIN" />
<action android:name="android.nfc.action.TECH_DISCOVERED" />

Expand Down Expand Up @@ -82,7 +82,7 @@
</service>

<provider
android:authorities="tud.seemuh.nfcgate"
android:authorities="de.tu_darmstadt.seemoo.nfcgate"
android:name="android.support.v4.content.FileProvider"
android:exported="false"
android:grantUriPermissions="true">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db;
package de.tu_darmstadt.seemoo.nfcgate.db;

import android.arch.persistence.db.SupportSQLiteDatabase;
import android.arch.persistence.room.Database;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package tud.seemuh.nfcgate.db;
package de.tu_darmstadt.seemoo.nfcgate.db;

import android.arch.persistence.room.TypeConverter;

import java.util.Date;

import tud.seemuh.nfcgate.util.NfcComm;
import de.tu_darmstadt.seemoo.nfcgate.util.NfcComm;

public class Converters {
@TypeConverter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package tud.seemuh.nfcgate.db;
package de.tu_darmstadt.seemoo.nfcgate.db;

import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
import android.arch.persistence.room.ForeignKey;
import android.arch.persistence.room.Index;
import android.arch.persistence.room.PrimaryKey;

import tud.seemuh.nfcgate.util.NfcComm;
import de.tu_darmstadt.seemoo.nfcgate.util.NfcComm;

@Entity(indices = {@Index("sessionId")},
foreignKeys = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db;
package de.tu_darmstadt.seemoo.nfcgate.db;

import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Insert;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db;
package de.tu_darmstadt.seemoo.nfcgate.db;

import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db;
package de.tu_darmstadt.seemoo.nfcgate.db;

import android.arch.lifecycle.LiveData;
import android.arch.persistence.room.Dao;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db;
package de.tu_darmstadt.seemoo.nfcgate.db;

import android.arch.persistence.room.Embedded;
import android.arch.persistence.room.Relation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
package tud.seemuh.nfcgate.db;
package de.tu_darmstadt.seemoo.nfcgate.db;

import android.arch.lifecycle.LiveData;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Delete;
import android.arch.persistence.room.Insert;
import android.arch.persistence.room.Query;
import android.arch.persistence.room.Transaction;

import java.util.List;

@Dao
public interface SessionLogJoinDao {
@Transaction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db;
package de.tu_darmstadt.seemoo.nfcgate.db;

import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db;
package de.tu_darmstadt.seemoo.nfcgate.db;

import android.arch.lifecycle.LiveData;
import android.arch.persistence.room.Dao;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package tud.seemuh.nfcgate.db.model;
package de.tu_darmstadt.seemoo.nfcgate.db.model;

import android.app.Application;
import android.arch.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData;
import android.support.annotation.NonNull;

import tud.seemuh.nfcgate.db.AppDatabase;
import tud.seemuh.nfcgate.db.SessionLogJoin;
import de.tu_darmstadt.seemoo.nfcgate.db.AppDatabase;
import de.tu_darmstadt.seemoo.nfcgate.db.SessionLogJoin;

public class SessionLogEntryViewModel extends AndroidViewModel {
private final LiveData<SessionLogJoin> mSession;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db.model;
package de.tu_darmstadt.seemoo.nfcgate.db.model;

import android.app.Application;
import android.arch.lifecycle.ViewModel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db.model;
package de.tu_darmstadt.seemoo.nfcgate.db.model;

import android.app.Application;
import android.arch.lifecycle.AndroidViewModel;
Expand All @@ -7,8 +7,8 @@

import java.util.List;

import tud.seemuh.nfcgate.db.AppDatabase;
import tud.seemuh.nfcgate.db.SessionLog;
import de.tu_darmstadt.seemoo.nfcgate.db.AppDatabase;
import de.tu_darmstadt.seemoo.nfcgate.db.SessionLog;

public class SessionLogViewModel extends AndroidViewModel {
private final LiveData<List<SessionLog>> mSessionLog;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db.model;
package de.tu_darmstadt.seemoo.nfcgate.db.model;

import android.app.Application;
import android.arch.lifecycle.AndroidViewModel;
Expand All @@ -8,9 +8,9 @@

import java.util.List;

import tud.seemuh.nfcgate.db.AppDatabase;
import tud.seemuh.nfcgate.db.TagInfo;
import tud.seemuh.nfcgate.db.TagInfoDao;
import de.tu_darmstadt.seemoo.nfcgate.db.AppDatabase;
import de.tu_darmstadt.seemoo.nfcgate.db.TagInfo;
import de.tu_darmstadt.seemoo.nfcgate.db.TagInfoDao;

public class TagInfoViewModel extends AndroidViewModel {
private final LiveData<List<TagInfo>> mTagInfos;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package tud.seemuh.nfcgate.db.pcapng;
package de.tu_darmstadt.seemoo.nfcgate.db.pcapng;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;

import tud.seemuh.nfcgate.db.pcapng.base.PcapPacket;
import tud.seemuh.nfcgate.util.NfcComm;
import de.tu_darmstadt.seemoo.nfcgate.db.pcapng.base.PcapPacket;
import de.tu_darmstadt.seemoo.nfcgate.util.NfcComm;

public class ISO14443Packet extends PcapPacket {
private static final byte DATA_PICC_TO_PCD_CRC_DROPPED = (byte) 0xFB;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package tud.seemuh.nfcgate.db.pcapng;
package de.tu_darmstadt.seemoo.nfcgate.db.pcapng;

import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;

import tud.seemuh.nfcgate.db.pcapng.base.PcapPacket;
import tud.seemuh.nfcgate.db.pcapng.base.PcapStream;
import tud.seemuh.nfcgate.util.NfcComm;
import de.tu_darmstadt.seemoo.nfcgate.db.pcapng.base.PcapPacket;
import de.tu_darmstadt.seemoo.nfcgate.db.pcapng.base.PcapStream;
import de.tu_darmstadt.seemoo.nfcgate.util.NfcComm;

public class ISO14443Stream extends PcapStream {
// interface 0 is ISO14443, 1 is DLT_USER_0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db.pcapng.base;
package de.tu_darmstadt.seemoo.nfcgate.db.pcapng.base;

import java.io.DataInputStream;
import java.io.DataOutputStream;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.db.pcapng.base;
package de.tu_darmstadt.seemoo.nfcgate.db.pcapng.base;

import java.io.DataInputStream;
import java.io.DataOutputStream;
Expand All @@ -8,7 +8,7 @@
import java.util.ArrayList;
import java.util.List;

import tud.seemuh.nfcgate.gui.component.FileShare;
import de.tu_darmstadt.seemoo.nfcgate.gui.component.FileShare;

public class PcapStream implements FileShare.IFileShareable {
private static final int BLOCK_TYPE_SECTION = 0x0A0D0D0A;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package tud.seemuh.nfcgate.db.worker;
package de.tu_darmstadt.seemoo.nfcgate.db.worker;

import android.content.Context;

import java.util.Date;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;

import tud.seemuh.nfcgate.db.AppDatabase;
import tud.seemuh.nfcgate.db.NfcCommEntry;
import tud.seemuh.nfcgate.db.SessionLog;
import tud.seemuh.nfcgate.util.NfcComm;
import de.tu_darmstadt.seemoo.nfcgate.db.AppDatabase;
import de.tu_darmstadt.seemoo.nfcgate.db.NfcCommEntry;
import de.tu_darmstadt.seemoo.nfcgate.db.SessionLog;
import de.tu_darmstadt.seemoo.nfcgate.util.NfcComm;

public class LogInserter {
public interface SIDChangedListener {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.gui;
package de.tu_darmstadt.seemoo.nfcgate.gui;

import android.content.Intent;
import android.net.Uri;
Expand All @@ -23,21 +23,21 @@
import java.io.IOException;
import java.util.List;

import tud.seemuh.nfcgate.R;
import tud.seemuh.nfcgate.db.SessionLog;
import tud.seemuh.nfcgate.db.pcapng.ISO14443Stream;
import tud.seemuh.nfcgate.db.worker.LogInserter;
import tud.seemuh.nfcgate.gui.fragment.AboutFragment;
import tud.seemuh.nfcgate.gui.fragment.CaptureFragment;
import tud.seemuh.nfcgate.gui.fragment.CloneFragment;
import tud.seemuh.nfcgate.gui.fragment.StatusFragment;
import tud.seemuh.nfcgate.gui.log.LoggingFragment;
import tud.seemuh.nfcgate.gui.fragment.RelayFragment;
import tud.seemuh.nfcgate.gui.fragment.ReplayFragment;
import tud.seemuh.nfcgate.gui.fragment.SettingsFragment;
import tud.seemuh.nfcgate.nfc.NfcManager;
import tud.seemuh.nfcgate.nfc.reader.NFCTagReader;
import tud.seemuh.nfcgate.util.NfcComm;
import de.tu_darmstadt.seemoo.nfcgate.R;
import de.tu_darmstadt.seemoo.nfcgate.db.SessionLog;
import de.tu_darmstadt.seemoo.nfcgate.db.pcapng.ISO14443Stream;
import de.tu_darmstadt.seemoo.nfcgate.db.worker.LogInserter;
import de.tu_darmstadt.seemoo.nfcgate.gui.fragment.AboutFragment;
import de.tu_darmstadt.seemoo.nfcgate.gui.fragment.CaptureFragment;
import de.tu_darmstadt.seemoo.nfcgate.gui.fragment.CloneFragment;
import de.tu_darmstadt.seemoo.nfcgate.gui.fragment.StatusFragment;
import de.tu_darmstadt.seemoo.nfcgate.gui.log.LoggingFragment;
import de.tu_darmstadt.seemoo.nfcgate.gui.fragment.RelayFragment;
import de.tu_darmstadt.seemoo.nfcgate.gui.fragment.ReplayFragment;
import de.tu_darmstadt.seemoo.nfcgate.gui.fragment.SettingsFragment;
import de.tu_darmstadt.seemoo.nfcgate.nfc.NfcManager;
import de.tu_darmstadt.seemoo.nfcgate.nfc.reader.NFCTagReader;
import de.tu_darmstadt.seemoo.nfcgate.util.NfcComm;

public class MainActivity extends AppCompatActivity {
// UI
Expand Down Expand Up @@ -137,7 +137,7 @@ else if (Intent.ACTION_SEND.equals(intent.getAction()))
importPcap(intent.<Uri>getParcelableExtra(Intent.EXTRA_STREAM));
else if (Intent.ACTION_VIEW.equals(intent.getAction()))
importPcap(intent.getData());
else if ("tud.seemuh.nfcgate.capture".equals(intent.getAction()))
else if ("de.tu_darmstadt.seemoo.nfcgate.capture".equals(intent.getAction()))
importCapture(intent.<Bundle>getParcelableArrayListExtra("capture"));
else
super.onNewIntent(intent);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.gui.component;
package de.tu_darmstadt.seemoo.nfcgate.gui.component;

import android.content.Context;
import android.support.annotation.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.gui.component;
package de.tu_darmstadt.seemoo.nfcgate.gui.component;

import android.content.Context;
import android.content.Intent;
Expand All @@ -11,7 +11,7 @@
import java.io.IOException;
import java.io.OutputStream;

import tud.seemuh.nfcgate.BuildConfig;
import de.tu_darmstadt.seemoo.nfcgate.BuildConfig;

public class FileShare {
public interface IFileShareable {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package tud.seemuh.nfcgate.gui.component;
package de.tu_darmstadt.seemoo.nfcgate.gui.component;

import android.support.annotation.DrawableRes;
import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;

import tud.seemuh.nfcgate.R;
import tud.seemuh.nfcgate.gui.MainActivity;
import de.tu_darmstadt.seemoo.nfcgate.R;
import de.tu_darmstadt.seemoo.nfcgate.gui.MainActivity;

public class Semaphore {
// state for each color
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.gui.component;
package de.tu_darmstadt.seemoo.nfcgate.gui.component;

public class StatusItem {
public enum State {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tud.seemuh.nfcgate.gui.fragment;
package de.tu_darmstadt.seemoo.nfcgate.gui.fragment;

import android.content.Intent;
import android.net.Uri;
Expand All @@ -14,7 +14,7 @@

import mehdi.sakout.aboutpage.AboutPage;
import mehdi.sakout.aboutpage.Element;
import tud.seemuh.nfcgate.R;
import de.tu_darmstadt.seemoo.nfcgate.R;

public class AboutFragment extends Fragment {
@Override
Expand Down