Implemented NFC Card Reader Code from https://git.sterul.com/student-projects/dhbw...

[DHBWCampusApp.git] / app / src / main / java / de / dhbwloe / campusapp / database / DatabaseManager.java

diff --git a/app/src/main/java/de/dhbwloe/campusapp/database/DatabaseManager.java b/app/src/main/java/de/dhbwloe/campusapp/database/DatabaseManager.java
index 43a5fd5666c8326560a98bffd067f31cc0d510d1..97875404cb33f58a0d0977a1e6f916c77ef9915d 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/database/DatabaseManager.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/database/DatabaseManager.java
@@ -109,7 +109,6 @@ public class DatabaseManager {
                     "(" +
                     "CardId INT, " +
                     "UpdateTime INT," +
-                    "CardData TEXT, " +
                     "CardBalance INT, " +
                     "CardLastTransaction INT, " +
                     "PRIMARY KEY (CardId, UpdateTime)" +
@@ -279,13 +278,10 @@ public class DatabaseManager {
                 Integer.toString(nfcCardData.getUniqueId()),
                 Long.toString(nfcCardData.getLastUpdate())
         };
-        Cursor resultSet = database.rawQuery("SELECT CardData FROM NfcCardStore WHERE CardId = ? AND UpdateTime = ?", whereArgs);
+        Cursor resultSet = database.rawQuery("SELECT CardBalance FROM NfcCardStore WHERE CardId = ? AND UpdateTime = ?", whereArgs);
         if(resultSet.moveToFirst()) {
-            if(resultSet.getString(0).equalsIgnoreCase(nfcCardData.getCardData()))
-                return;
             try {
                 ContentValues updateValues = new ContentValues();
-                updateValues.put("CardData", nfcCardData.getCardData());
                 updateValues.put("CardBalance", nfcCardData.getBalance());
                 updateValues.put("CardLastTransaction", nfcCardData.getLastTransaction());
 
@@ -298,7 +294,6 @@ public class DatabaseManager {
                 ContentValues indexValues = new ContentValues();
                 indexValues.put("CardId", nfcCardData.getUniqueId());
                 indexValues.put("UpdateTime", nfcCardData.getLastUpdate());
-                indexValues.put("CardData", nfcCardData.getCardData());
                 indexValues.put("CardBalance", nfcCardData.getBalance());
                 indexValues.put("CardLastTransaction", nfcCardData.getLastTransaction());
 
@@ -317,13 +312,13 @@ public class DatabaseManager {
             String[] whereArgs = {
                     Integer.toString(lastLimit)
             };
-            resultSet = database.rawQuery("SELECT CardId,UpdateTime,CardData,CardBalance,CardLastTransaction FROM NfcCardStore ORDER BY UpdateTime DESC LIMIT ?", whereArgs);
+            resultSet = database.rawQuery("SELECT CardId,UpdateTime,CardBalance,CardLastTransaction FROM NfcCardStore ORDER BY UpdateTime DESC LIMIT ?", whereArgs);
         } else
-            resultSet = database.rawQuery("SELECT CardId,UpdateTime,CardData,CardBalance,CardLastTransaction FROM NfcCardStore ORDER BY UpdateTime DESC", null);
+            resultSet = database.rawQuery("SELECT CardId,UpdateTime,CardBalance,CardLastTransaction FROM NfcCardStore ORDER BY UpdateTime DESC", null);
         ArrayList<NfcCardData> nfcCardDatas = new ArrayList<NfcCardData>();
         if(resultSet.moveToFirst()) {
             do {
-                NfcCardData nfcCardData = new NfcCardData(resultSet.getInt(0), resultSet.getLong(1), resultSet.getString(2), resultSet.getInt(3), resultSet.getInt(4));
+                NfcCardData nfcCardData = new NfcCardData(resultSet.getInt(0), resultSet.getLong(1), resultSet.getInt(2), resultSet.getInt(3));
                 nfcCardDatas.add(nfcCardData);
             } while (resultSet.moveToNext());
         }