ScreamerDot changes (synchronization, push notifications, improve locations)

app/build.gradle

@@ -123,16 +123,17 @@ dependencies {
     implementation files('libs/juniversalchardet-1.0.3.jar')
     implementation(name: 'MaterialShowCase-1.0.5', ext: 'aar')
     implementation(name: 'HeaderDecor-0.2.7', ext: 'aar')
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     annotationProcessor 'com.github.hotchemi:permissionsdispatcher-processor:3.1.0'
-    implementation 'com.airbnb.android:airmapview:1.6.0'
+    implementation 'com.airbnb.android:airmapview:2.1.1'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.preference:preference:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation "com.google.android.gms:play-services-maps:17.0.0"
-    implementation "com.google.android.gms:play-services-vision:19.0.0"
+    implementation "com.google.android.gms:play-services-vision:20.1.2"
     implementation 'com.dlazaro66.qrcodereaderview:qrcodereaderview:2.0.3'
     implementation 'com.dropbox.core:dropbox-core-sdk:3.0.6'
     implementation 'com.evernote:android-job:1.2.5'

app/src/androidTest/java/com/yoshione/fingen/SmsParserTest.java

@@ -8,11 +8,13 @@
 
 import com.yoshione.fingen.dao.AccountsDAO;
 import com.yoshione.fingen.dao.CabbagesDAO;
+import com.yoshione.fingen.dao.LocationsDAO;
 import com.yoshione.fingen.dao.PayeesDAO;
 import com.yoshione.fingen.dao.SendersDAO;
 import com.yoshione.fingen.dao.SmsMarkersDAO;
 import com.yoshione.fingen.model.Account;
 import com.yoshione.fingen.model.Cabbage;
+import com.yoshione.fingen.model.Location;
 import com.yoshione.fingen.model.Payee;
 import com.yoshione.fingen.model.Sender;
 import com.yoshione.fingen.model.Sms;
@@ -65,6 +67,7 @@ public void smsParser_CorrectParseSms() {
         Account account = null;
         Account destAccount = null;
         Payee payee = null;
+        Location location = null;
         try {
             cabbage1 = (Cabbage) CabbagesDAO.getInstance(context).createModel(new Cabbage(-1, "CB1", "CB1", "Cabbage1", 2));
             cabbage2 = (Cabbage) CabbagesDAO.getInstance(context).createModel(new Cabbage(-1, "CB2", "CB2", "Cabbage2", 2));
@@ -73,6 +76,7 @@ public void smsParser_CorrectParseSms() {
             destAccount = (Account) AccountsDAO.getInstance(context).createModel(new Account(-1, "AccountDest", cabbage1.getID(), "", "", BigDecimal.ZERO,
                     Account.AccountType.atCash, 0, false, true, BigDecimal.ZERO, BigDecimal.ZERO, 0, BigDecimal.ZERO));
             payee = (Payee) PayeesDAO.getInstance(context).createModel(new Payee(-1, "Payee", -1, -1, 0, false));
+            location = (Location) LocationsDAO.getInstance(context).createModel(new Location(-1, "Location", -1, -1, 0, false));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -154,6 +158,13 @@ public void smsParser_CorrectParseSms() {
                             break;
                     }
                 }
+                //тест извлечения локации
+                if (!smsTest.mLocationMarker.isEmpty()) {
+                    Log.d(TAG, String.format("Payee %s with marker %s extracted (id = %d)", location.getName(), smsTest.mLocationMarker, location.getID()));
+                    assertThat(smsParser.extractLocation().getID(), is(location.getID()));
+
+                    }
+                }
 
                 //тест извлечения суммы
                 Log.d(TAG, String.format("Amount %s with currency %s extracted", new CabbageFormatter(cabbage1).format(smsTest.mAmount), cabbage1.getCode()));
@@ -205,6 +216,7 @@ public void procRow(int i, String... strings) {
                 smsTest.mDestAccount = vls.get(9).replaceAll("\"","").trim();
                 smsTest.mAmountPos = Integer.valueOf(vls.get(10).replaceAll("\"","").trim());
                 smsTest.mBalancePos = Integer.valueOf(vls.get(11).replaceAll("\"","").trim());
+                smsTest.mLocationMarker = vls.get(12).replaceAll("\"","").trim();
                 smsTests.add(smsTest);
             }
         });
@@ -213,6 +225,7 @@ public void procRow(int i, String... strings) {
     private class SmsTest {
         String mText;
         String mAccountMarker;
+        String mLocationMarker;
         String mTypeMarker;
         int mType;
         BigDecimal mAmount;