Merge branch 'develop'

Author: federicoiosue

.sauce/config.yml

@@ -4,7 +4,7 @@ sauce:
   region: eu-central-1
   retries: 2
 espresso:
-  app: ./omniNotes/build/intermediates/apk/play/debug/OmniNotes-playDebug-6.2.1.apk
+  app: ./omniNotes/build/intermediates/apk/play/debug/OmniNotes-playDebug-6.2.6.apk
   testApp: ./omniNotes/build/intermediates/apk/androidTest/play/debug/omniNotes-play-debug-androidTest.apk
 suites:
   - name: "All tests (no flaky, real device only) on Android 13"

README.md

@@ -78,7 +78,7 @@ Build instructions:
 * Clone the application by using the link to the repository (https://github.com/federicoiosue/Omni-Notes), this will take a couple minutes
 * Enter the Omni-Notes folder using the command $cd Omni-Notes
 * Check that the branch is up to date by using the command $git status
-* Enter the command $export ANDROID_HOME=/home/fede/Android/Sdk
+* Enter the command $export ANDROID_HOME=/home/fede/Android/Sdk (for Windows $set ANDROID_HOME=/home/fede/Android/Sdk)
 * Enter the command $./gradlew assemble
 * Allow a couple minutes for the application to build.
 * View the outputs of the build using the command $ls -l omniNotes/build/outputs/apk

gradle.properties

@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-VERSION_NAME=6.2.5
-VERSION_CODE=320
+VERSION_NAME=6.2.6
+VERSION_CODE=321
 PACKAGE=it.feio.android.omninotes
 MIN_SDK=21
 TARGET_SDK=31

omniNotes/src/androidTest/java/it/feio/android/omninotes/testutils/BaseAndroidTestCase.java

@@ -46,6 +46,7 @@
 import it.feio.android.omninotes.models.Attachment;
 import it.feio.android.omninotes.models.Category;
 import it.feio.android.omninotes.models.Note;
+import it.feio.android.omninotes.utils.StorageHelper;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -58,6 +59,7 @@
 import java.util.List;
 import java.util.Locale;
 import org.apache.commons.io.IOUtils;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
@@ -68,6 +70,7 @@ public class BaseAndroidTestCase {
   protected static DbHelper dbHelper;
   protected static Context testContext;
   protected static SharedPreferences prefs;
+  private File testAttachment;
 
   @BeforeClass
   public static void setUpBeforeClass() {
@@ -84,6 +87,13 @@ public void setUpBase() {
     preparePreferences();
   }
 
+  @After
+  public void tearDown() {
+    if (testAttachment != null && testAttachment.exists()) {
+      testAttachment.delete();
+    }
+  }
+
   private static void grantPermissions() {
     GrantPermissionRule.grant(ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION, READ_EXTERNAL_STORAGE, RECORD_AUDIO);
     if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
@@ -131,7 +141,7 @@ protected Note createTestNote(String title, String content, int attachmentsNumbe
 
   protected Attachment createTestAttachment(String attachmentName) {
     try {
-      File testAttachment = File.createTempFile(attachmentName, ".txt");
+      testAttachment = new File(StorageHelper.getAttachmentDir(), attachmentName);
       IOUtils.write(
           String.format("some test content for attachment named %s", attachmentName).toCharArray(),
           new FileOutputStream(testAttachment));

omniNotes/src/androidTest/java/it/feio/android/omninotes/utils/FileProviderHelperTest.kt

@@ -18,41 +18,22 @@
 package it.feio.android.omninotes.utils
 
 
-import android.net.Uri
-import androidx.core.net.toUri
 import it.feio.android.omninotes.OmniNotes.getAppContext
-import it.feio.android.omninotes.models.Attachment
 import it.feio.android.omninotes.testutils.BaseAndroidTestCase
-import it.feio.android.omninotes.utils.ConstantsBase.MIME_TYPE_IMAGE
 import org.junit.Assert.*
 import org.junit.Test
-import java.io.File
 
 class FileProviderHelperTest : BaseAndroidTestCase() {
 
     @Test
     fun getShareableUri() {
-        val file = File("/storage/emulated/0/Android/data/it.feio.android.omninotes/files/424242.png")
-        assertTrue(file.createNewFile() || file.exists())
-        val attachment = Attachment(file.toUri(), MIME_TYPE_IMAGE)
+        val attachment = createTestAttachment("testAttachment.txt")
 
         val res = FileProviderHelper.getShareableUri(attachment)
 
         assertNotNull(res)
-        assertNotEquals(file.toUri(), res)
+        assertNotEquals(attachment.uri, res)
         assertTrue(res?.scheme.equals("content") && res?.authority.equals(getAppContext().packageName + ".authority"))
-
-        file.deleteOnExit()
-    }
-
-    @Test
-    fun getShareableUri_contentScheme() {
-        val uri = "content://it.feio.android.omninotes.authority/external_files/Android/data/it.feio.android.omninotes/files/20230418_091959_730.jpeg"
-        val attachment = Attachment(Uri.parse(uri), "")
-
-        val res = FileProviderHelper.getShareableUri(attachment)
-
-        assertEquals(uri, res.toString())
     }
 
 }

omniNotes/src/androidTest/java/it/feio/android/omninotes/utils/GeocodeHelperTest.java

@@ -32,11 +32,10 @@ public class GeocodeHelperTest extends BaseAndroidTestCase {
 
   @Test
   public void testGetAddressFromCoordinates() throws IOException {
-    if (ConnectionManager.internetAvailable(OmniNotes.getAppContext())) {
-      double LAT = 43.799328;
-      double LON = 11.171552;
-      String address = GeocodeHelper.getAddressFromCoordinates(OmniNotes.getAppContext(), LAT, LON);
-      Assert.assertTrue(address.length() > 0);
-    }
+    double LAT = 43.799328;
+    double LON = 11.171552;
+    String address = GeocodeHelper.getAddressFromCoordinates(OmniNotes.getAppContext(), LAT, LON);
+    Assert.assertTrue(address.length() > 0);
   }
+
 }

omniNotes/src/main/AndroidManifest.xml

@@ -19,10 +19,8 @@
   xmlns:tools="http://schemas.android.com/tools">
 
 
-  <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29"/>
   <uses-permission android:name="android.permission.VIBRATE" />
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java

@@ -159,7 +159,6 @@
 import it.feio.android.omninotes.models.views.ExpandableHeightGridView;
 import it.feio.android.omninotes.utils.AlphaManager;
 import it.feio.android.omninotes.utils.BitmapHelper;
-import it.feio.android.omninotes.utils.ConnectionManager;
 import it.feio.android.omninotes.utils.Display;
 import it.feio.android.omninotes.utils.FileHelper;
 import it.feio.android.omninotes.utils.FileProviderHelper;
@@ -2209,20 +2208,13 @@ public void onLocationUnavailable() {
 
     @Override
     public void onLocationRetrieved(Location location) {
-
       if (!checkWeakReferences()) {
         return;
       }
 
       if (location == null) {
         return;
       }
-      if (!ConnectionManager.internetAvailable(mainActivityWeakReference.get())) {
-        noteTmpWeakReference.get().setLatitude(location.getLatitude());
-        noteTmpWeakReference.get().setLongitude(location.getLongitude());
-        onAddressResolved("");
-        return;
-      }
       LayoutInflater inflater = mainActivityWeakReference.get().getLayoutInflater();
       View v = inflater.inflate(R.layout.dialog_location, null);
       final AutoCompleteTextView autoCompView = v.findViewById(R.id

omniNotes/src/main/java/it/feio/android/omninotes/SettingsFragment.java

@@ -582,7 +582,7 @@ private DocumentFileCompat scopedStorageFolderChoosen() throws ExternalStoragePr
         throw new ExternalStorageProviderException("Can't write into " + backupFolder);
       }
       return backupFolder;
-    } catch (SecurityException | NullPointerException e) {
+    } catch (SecurityException | NullPointerException | IllegalArgumentException e) {
       throw new ExternalStorageProviderException(e);
     }
   }

omniNotes/src/main/java/it/feio/android/omninotes/async/DataBackupIntentService.java

@@ -136,8 +136,7 @@ private synchronized void deleteData(Intent intent) {
 
     StorageHelper.delete(this, backupDir.getAbsolutePath());
 
-    mNotificationsHelper.finish(getString(R.string.data_deletion_completed),
-        backupName + " " + getString(R.string.deleted));
+    mNotificationsHelper.finish(getString(R.string.data_deletion_completed), backupName + " " + getString(R.string.deleted));
   }
 
   private void createNotification(Intent intent, Context context, String title, String message) {

omniNotes/src/main/java/it/feio/android/omninotes/utils/ConnectionManager.java

@@ -45,7 +45,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -85,12 +84,12 @@ public void onProviderDisabled(String provider) {
 
 
   public static void getLocation(OnGeoUtilResultListener onGeoUtilResultListener) {
-    SmartLocation.LocationControl bod = SmartLocation.with(OmniNotes.getAppContext())
+      SmartLocation.LocationControl bod = SmartLocation.with(OmniNotes.getAppContext())
         .location(getProvider(OmniNotes.getAppContext()))
         .config(LocationParams.NAVIGATION).oneFix();
 
     Observable<Location> locations = ObservableFactory.from(bod).timeout(2, TimeUnit.SECONDS);
-    locations.subscribe(new Subscriber<Location>() {
+    locations.subscribe(new Subscriber<>() {
       @Override
       public void onNext(Location location) {
         onGeoUtilResultListener.onLocationRetrieved(location);
@@ -141,7 +140,7 @@ public static void getAddressFromCoordinates(Location location,
     } else {
       SmartLocation.with(OmniNotes.getAppContext()).geocoding()
           .reverse(location, (location1, list) -> {
-            String address = list.size() > 0 ? list.get(0).getAddressLine(0) : null;
+            String address = !list.isEmpty() ? list.get(0).getAddressLine(0) : null;
             onGeoUtilResultListener.onAddressResolved(address);
           });
     }
@@ -225,30 +224,25 @@ public static List<String> autocomplete(String input) {
     } catch (JSONException e) {
       LogDelegate.e("Cannot process JSON results", e);
     } finally {
-      if (conn != null) {
-        conn.disconnect();
-      }
+      conn.disconnect();
       SystemHelper.closeCloseable(in);
     }
     return resultList;
   }
 
 
   public static boolean areCoordinates(String string) {
-    Pattern p = Pattern
-        .compile("^[-+]?([1-8]?\\d(\\.\\d+)?|90(\\.0+)?),\\s*[-+]?(180(\\.0+)?|((1[0-7]\\d)|" +
-            "([1-9]?\\d))(\\.\\d+)?)$");
-    Matcher m = p.matcher(string);
-    return m.matches();
+    var p = Pattern.compile(
+        "^[-+]?([1-8]?\\d(\\.\\d+)?|90(\\.0+)?),\\s*[-+]?(180(\\.0+)?|((1[0-7]\\d)|([1-9]?\\d))(\\.\\d+)?)$");
+    return p.matcher(string).matches();
   }
 
   /**
    * Checks for location provider between {@link android.location.LocationManager#GPS_PROVIDER}
    * etc...
    */
   public static boolean checkLocationProviderEnabled(Context context, String provider) {
-    LocationManager locationManager = (LocationManager) context
-        .getSystemService(Context.LOCATION_SERVICE);
+    var locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
     return locationManager.isProviderEnabled(provider);
   }