mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Attempt to fix stuff"

Browse source 
This reverts commit 58b640a8c85f090c9d8b9fc8de342e95a708f7a0.
This commit is contained in:
Mario Danic 2017-02-23 10:39:35 +01:00 committed by AndyScherzinger
parent 8bfdd0047c
commit 49c27b1464
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/owncloud/android/services/FileAlterationMagicListener.java
View file

@ -92,7 +92,7 @@ public class FileAlterationMagicListener implements FileAlterationListener {
} }
public void onFileCreate(final File file, int delay) { public void onFileCreate(final File file, int delay) {
if (file != null && !uploadMap.containsKey(file.getAbsolutePath())) { if (file != null) {
uploadMap.put(file.getAbsolutePath(), null); uploadMap.put(file.getAbsolutePath(), null);
String mimetypeString = FileStorageUtils.getMimeTypeFromName(file.getAbsolutePath()); String mimetypeString = FileStorageUtils.getMimeTypeFromName(file.getAbsolutePath());

6
src/com/owncloud/android/services/observer/FileAlterationMagicObserver.java
View file

@ -66,7 +66,6 @@ public class FileAlterationMagicObserver extends FileAlterationObserver implemen
private FileFilter fileFilter; private FileFilter fileFilter;
private Comparator<File> comparator; private Comparator<File> comparator;
private SyncedFolder syncedFolder; private SyncedFolder syncedFolder;
private boolean isCheckRunning = false;
private static final FileEntry[] EMPTY_ENTRIES = new FileEntry[0]; private static final FileEntry[] EMPTY_ENTRIES = new FileEntry[0];
@ -219,8 +218,6 @@ public class FileAlterationMagicObserver extends FileAlterationObserver implemen
*/ */
public void checkAndNotify() { public void checkAndNotify() {
if (!isCheckRunning) {
isCheckRunning = true;
/* fire onStart() */ /* fire onStart() */
for (final FileAlterationMagicListener listener : listeners) { for (final FileAlterationMagicListener listener : listeners) {
listener.onStart(this); listener.onStart(this);
@ -249,9 +246,6 @@ public class FileAlterationMagicObserver extends FileAlterationObserver implemen
for (final FileAlterationMagicListener listener : listeners) { for (final FileAlterationMagicListener listener : listeners) {
listener.onStop(this); listener.onStop(this);
} }
isCheckRunning = false;
}
} }
/** /**