V19

MMEX_Icon_Font/build.gradle

@@ -51,5 +51,5 @@ dependencies {
             "com.mikepenz:iconics-core:3.0.3@aar",
             "com.mikepenz:iconics-views:3.0.3@aar"
     )
-    api "androidx.appcompat:appcompat:1.2.0"
+    api 'androidx.appcompat:appcompat:1.6.1'
 }

androidSVG/build.gradle

@@ -49,5 +49,5 @@ android {
 }
 
 dependencies {
-implementation 'androidx.appcompat:appcompat:1.2.0'
-}
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+}

androidSVG/src/main/java/com/caverock/androidsvg/SVGImageView.java

@@ -31,11 +31,10 @@
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
-import android.widget.ImageView;
 
 /**
  * SVGImageView is a View widget that allows users to include SVG images in their layouts.
- * 
+ * <p>
  * It is implemented as a thin layer over {@code android.widget.ImageView}.
  *
  * <h2>XML attributes</h2>

app/build.gradle

@@ -189,12 +189,12 @@ dependencies {
     )
     implementation supportDependencies.core
     implementation supportDependencies.support
-    implementation supportDependencies.appCompat
-    implementation supportDependencies.recyclerView
+    implementation "androidx.appcompat:appcompat:1.6.1"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation supportDependencies.cardView
     implementation supportDependencies.design
     implementation supportDependencies.preference
-    implementation supportDependencies.supportAnnotation
+    implementation "androidx.annotation:annotation:1.6.0"
     implementation supportDependencies.gridLayout
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'            // Retrofit
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
@@ -230,7 +230,7 @@ dependencies {
             //'com.squareup.assertj:assertj-android:1.1.1',
             // Matchers
             'org.hamcrest:hamcrest-core:1.3',
-            'org.hamcrest:hamcrest-library:1.3',
+            'org.hamcrest:hamcrest-library:2.2',
             'org.hamcrest:hamcrest-integration:1.3'
             // async handling
             // 'com.jayway.awaitility:awaitility:1.6.4',
@@ -246,19 +246,19 @@ dependencies {
 
     // UI testing
     androidTestImplementation(
-            'androidx.test:runner:1.1.0-alpha4',
+            'androidx.test:runner:1.5.2',
             // Set this dependency to use JUnit 4 rules
-            'androidx.test:rules:1.1.0-alpha4',
+            'androidx.test:rules:1.5.0',
             // Set this dependency to build and run Espresso tests
-            'androidx.test.espresso:espresso-core:3.1.0-alpha4',
-            'androidx.test.espresso:espresso-contrib:3.1.0-alpha4',
+            'androidx.test.espresso:espresso-core:3.5.1',
+            'androidx.test.espresso:espresso-contrib:3.5.1',
             // add this for intent mocking support
             // 'com.android.support.test.espresso:espresso-intents:2.2.2'
             // add this for webview testing support
             // 'com.android.support.test.espresso:espresso-web:2.2.2'
             // Matchers
             'org.hamcrest:hamcrest-core:1.3',
-            'org.hamcrest:hamcrest-library:1.3',
+            'org.hamcrest:hamcrest-library:2.2',
             'com.squareup.assertj:assertj-android:1.2.0',
             'org.assertj:assertj-core:3.9.1',
             // Robotium, UI testing
@@ -268,7 +268,7 @@ dependencies {
     )
     // Set this dependency to build and run UI Automator tests
     //    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
-    implementation 'com.google.firebase:firebase-analytics:17.4.1'
+    implementation 'com.google.firebase:firebase-analytics:21.2.1'
 }
 
 configurations {

app/src/main/java/com/money/manager/ex/about/AboutCreditsFragment.java

@@ -17,6 +17,8 @@
 
 package com.money.manager.ex.about;
 
+import static com.money.manager.ex.R.raw.credits_thirdparty;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -56,7 +58,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
         WebSettings settings = webView.getSettings();
         settings.setDefaultTextEncodingName("utf-8");
 
-        webView.loadData(MmxFileUtils.getRawAsString(getActivity().getApplicationContext(), R.raw.credits_thirdparty),
+        webView.loadData(MmxFileUtils.getRawAsString(getActivity().getApplicationContext(), credits_thirdparty),
                 "text/html; charset=utf-8", null);
     }
 }

app/src/main/java/com/money/manager/ex/common/AllDataListFragment.java

@@ -327,25 +327,6 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         }
     }
 
-    /**
-     * This is just to test:
-     * http://stackoverflow.com/questions/15207305/getting-the-error-java-lang-illegalstateexception-activity-has-been-destroyed
-     */
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        try {
-            Field childFragmentManager = Fragment.class.getDeclaredField("mChildFragmentManager");
-            childFragmentManager.setAccessible(true);
-            childFragmentManager.set(this, null);
-
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     @Override
     public void onDestroy() {
         if (mMultiChoiceModeListener != null)

app/src/main/java/com/money/manager/ex/core/Core.java

@@ -187,7 +187,7 @@ public Payee getLastPayeeUsed() {
         Payee payee = null;
 
         String sql =
-        "SELECT C.TransID, C.TransDate, C.PAYEEID, P.PAYEENAME, P.CATEGID, P.SUBCATEGID " +
+        "SELECT C.TransID, C.TransDate, C.PAYEEID, P.PAYEENAME, P.CATEGID " +
         "FROM CHECKINGACCOUNT_V1 C " +
         "INNER JOIN PAYEE_V1 P ON C.PAYEEID = P.PAYEEID " +
         "WHERE C.TransCode <> 'Transfer' " +
@@ -202,7 +202,6 @@ public Payee getLastPayeeUsed() {
 //            payee.setPayeeId(cursor.getInt(cursor.getColumnIndex(Payee.PAYEEID)));
 //            payee.setPayeeName(cursor.getString(cursor.getColumnIndex(Payee.PAYEENAME)));
 //            payee.setCategId(cursor.getInt(cursor.getColumnIndex(Payee.CATEGID)));
-//            payee.setSubCategId(cursor.getInt(cursor.getColumnIndex(Payee.SUBCATEGID)));
             payee.loadFromCursor(cursor);
 
             cursor.close();

app/src/main/java/com/money/manager/ex/investment/watchlist/WatchlistItemsFragment.java

@@ -273,24 +273,6 @@ public boolean onContextItemSelected(android.view.MenuItem item) {
         return result;
     }
 
-    /**
-     * This is just to test:
-     * http://stackoverflow.com/questions/15207305/getting-the-error-java-lang-illegalstateexception-activity-has-been-destroyed
-     */
-    @Override
-    public void onDetach() {
-        super.onDetach();
-
-        try {
-            Field childFragmentManager = Fragment.class.getDeclaredField("mChildFragmentManager");
-            childFragmentManager.setAccessible(true);
-            childFragmentManager.set(this, null);
-        } catch (Exception e) {
-            // NoSuchFieldException | IllegalAccessException
-            throw new RuntimeException(e);
-        }
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();

app/src/main/java/com/money/manager/ex/settings/DatabaseSettingsFragment.java

@@ -253,8 +253,13 @@ private boolean createDatabase(String filename) {
     }
 
     private void refreshDbPath() {
+
+        DatabaseMetadata db = mDatabases.get().getCurrent();
         final Preference preference = findPreference(getActivity().getString(R.string.pref_database_path));
-        preference.setSummary(new DatabaseManager(getActivity().getApplicationContext()).getDatabasePath());
+        preference.setSummary(db.localPath);
+
+        final Preference remotePreference = findPreference(getActivity().getString(R.string.pref_remote_path));
+        remotePreference.setSummary(db.remotePath);
     }
 
     private void initDbSchemaCheckOption() {

app/src/main/res/values/prefids.xml

@@ -32,6 +32,7 @@
     <string name="pref_text_search_type">preftextsearchtype</string>
     <!-- database -->
     <string name="pref_database_path">databasepath</string>
+    <string name="pref_remote_path">remotepath</string>
     <string name="pref_database_check_integrity">pref_database_check_integrity</string>
     <string name="pref_db_check_schema">pref_db_check_schema</string>
     <string name="pref_database_create">createdatabase</string>

app/src/main/res/values/strings.xml

@@ -63,6 +63,7 @@
     <string name="version">Version</string>
     <string name="build">Build</string>
     <string name="path">Database path</string>
+    <string name="remote_path">Remote path</string>
     <string name="database_version">Database version</string>
     <string name="title_show_tutorial">Show tutorial</string>
     <string name="summary_show_tutorial">Show tutorial on the next run?</string>
@@ -776,4 +777,4 @@
     <string name="loan_account">Loan Accounts</string>
     <string name="shares_accounts">Shares Accounts</string>
     <string name="currency">Currency</string>
-</resources>
+</resources>

app/src/main/res/xml/preferences_database.xml

@@ -22,6 +22,11 @@
         android:key="@string/pref_database_path"
         android:title="@string/path" />
 
+    <Preference
+        android:icon="@null"
+        android:key="@string/pref_remote_path"
+        android:title="@string/remote_path" />
+
     <Preference
         android:icon="@null"
         android:key="@string/pref_database_version"
@@ -66,4 +71,4 @@
         android:icon="@null"
         android:key="@string/pref_sqlite_version"
         android:title="@string/android_sqlite_vesion" />
-</PreferenceScreen>
+</PreferenceScreen>

money/build.gradle

@@ -45,7 +45,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation 'androidx.appcompat:appcompat:1.6.1'
 
     testImplementation 'junit:junit:4.13.2'
 }