Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 886266e8 authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Merge branch '000-fix-incorrect-logging' into 'v1-oreo' 

Fix incorrect logging in CommonUtils and remove annoying log in contentScanner package

See merge request !181
parents 57b88301 c8bb45b9

app/src/main/java/foundation/e/drive/contentScanner/LocalContentScanner.java

+0 −2
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ public class LocalContentScanner extends AbstractContentScanner<File>{ 
            newSyncedFileState.setId( storedId );

            Timber.d("Add upload SyncRequest for new file %s", filePath);

            syncRequests.put(storedId, new SyncRequest(newSyncedFileState, SyncRequest.Type.UPLOAD));

        } else {

            Timber.d("Failed to insert (in DB) new SyncedFileState for %s", filePath);

        }

    }

app/src/main/java/foundation/e/drive/contentScanner/RemoteContentScanner.java

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ public class RemoteContentScanner extends AbstractContentScanner<RemoteFile> { 
            newFileState.setId(storedId);

            Timber.d("Add downloadSyncRequest for new remote file: %s", remoteFilePath);

            this.syncRequests.put(storedId, new DownloadRequest(file, newFileState));

        } else {

            Timber.d("Failed to insert (in DB) new SyncedFileState for remote file %s", remoteFilePath);

        }

    }

app/src/main/java/foundation/e/drive/utils/CommonUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public abstract class CommonUtils { 
     * @return True if there is connection, false either

     */

    public static boolean haveNetworkConnection(Context context, boolean meteredNetworkAllowed) {

        Timber.tag(TAG).v(TAG, "haveNetworkConnection()");

        Timber.tag(TAG).v("haveNetworkConnection()");



        final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);

        final NetworkCapabilities capabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());
@@ -220,7 +220,7 @@ public abstract class CommonUtils { 
     * @param filePath String containing path the file to update by mediaScanner

     */

    public static void doActionMediaScannerConnexionScanFile(Context context, final String filePath) {

        Timber.v(TAG, "doActionMediaScannerConnexionScanFile( %s )", filePath);

        Timber.v("doActionMediaScannerConnexionScanFile( %s )", filePath);

        final String[] filePathArray = new String[] { filePath };

        final String[] mimeType = new String[] {getMimeType(new File(filePath))};

        MediaScannerConnection.scanFile(context,