diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 03c14274c..f2b415c28 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index dce6e6283..9e078f456 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId = 'com.wagerrwallet' minSdkVersion 23 targetSdkVersion 28 - versionCode 280 - versionName "280" + versionCode 281 + versionName "281" multiDexEnabled true // Similar to other properties in the defaultConfig block, diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fc3bf5b37..e832e91dd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -45,7 +45,7 @@ android:label="@string/app_name" android:largeHeap="true" android:launchMode="singleTask" - android:supportsRtl="true" + android:supportsRtl="false" android:theme="@style/AppTheme" android:windowSoftInputMode="stateVisible|adjustResize"> getAllSports(Context app, String iso, long eventTi + " AND " + BRSQLiteHelper.BMTX_MAPPINGID + " IN " + "( SELECT DISTINCT "+ BRSQLiteHelper.BETX_SPORT + " FROM " + BRSQLiteHelper.BETX_TABLE_NAME; - QUERY += " WHERE " + BRSQLiteHelper.BETX_EVENT_TIMESTAMP+"> " + String.valueOf(eventTimestamp) + " ) "; QUERY += " ORDER BY " + BRSQLiteHelper.BMTX_STRING; cursor = database.rawQuery(QUERY, null); cursor.moveToFirst(); + HashMap map = new HashMap(); while (!cursor.isAfterLast()) { - BetMappingEntity transactionEntity = cursorToTransaction(app, iso.toUpperCase(), cursor); - transactions.add(transactionEntity); + String hash = cursor.getString(0); + String mappingId = String.valueOf(cursor.getLong(4)); + if ( !map.containsKey(mappingId) ) { // avoid duplicate mapping (same id) with different hash + BetMappingEntity transactionEntity = cursorToTransaction(app, iso.toUpperCase(), cursor); + transactions.add(transactionEntity); + map.put(mappingId, hash); + } cursor.moveToNext(); } } catch (Exception ex) {