From 7691d56f9f8055e6855bd9680c8306ec70b1cc64 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 2 Aug 2016 11:44:26 +0200
Subject: [PATCH] fixes after rebase, covert to lamda

---
 .../android/syncadapter/FileSyncAdapter.java  | 21 +++++++++++++--
 .../android/ui/activity/Preferences.java      | 27 +++++++------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 437f5f3e94cc..85e43d75cd20 100644
--- a/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -31,13 +31,30 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.SyncResult;
 import android.os.Bundle;
 import android.support.annotation.PluralsRes;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
-import android.support.v4.content.SharedPreferencesCompat;
+
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AuthenticatorActivity;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.operations.RefreshFolderOperation;
+import com.owncloud.android.operations.UpdateOCVersionOperation;
+import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
+
+import org.apache.jackrabbit.webdav.DavException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
diff --git a/src/main/java/com/owncloud/android/ui/activity/Preferences.java b/src/main/java/com/owncloud/android/ui/activity/Preferences.java
index 3af0b4909be3..4c47b194f82e 100644
--- a/src/main/java/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/main/java/com/owncloud/android/ui/activity/Preferences.java
@@ -25,18 +25,11 @@
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.ContentResolver;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerCallback;
-import android.accounts.AccountManagerFuture;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -255,7 +248,6 @@ private void setupAboutCategory(int accentColor, String appVersion) {
             pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name)));
             pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion));
         }
-        }
 
         // license
         boolean licenseEnabled = getResources().getBoolean(R.bool.license_enabled);
@@ -608,18 +600,17 @@ private void setupTimeBetweenSynchronizationsPreference(
         if (fSyncedFolderLightEnabled) {
             preferenceCategoryDetails.removePreference(mPrefTimeBetweenSynchronizations);
         } else if (mPrefTimeBetweenSynchronizations != null) {
-            mPrefTimeBetweenSynchronizations.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValueObject) {
-                    if (newValueObject instanceof String && ((String) newValueObject).length() > 0) {
-                        int newValue = Integer.parseInt((String) newValueObject);
-                        if (newValue > 0) {
-                            mPrefTimeBetweenSynchronizations.setSummary(getResources().getQuantityString(R.plurals.minutes, newValue, newValue));
-                            return true;
-                        }
+            mPrefTimeBetweenSynchronizations.setOnPreferenceChangeListener((preference, newValueObject) -> {
+                if (newValueObject instanceof String && ((String) newValueObject).length() > 0) {
+                    int newValue = Integer.parseInt((String) newValueObject);
+                    if (newValue > 0) {
+                        mPrefTimeBetweenSynchronizations.setSummary(
+                                getResources().getQuantityString(
+                                        R.plurals.minutes, newValue, newValue));
+                        return true;
                     }
-                    return false;
                 }
+                return false;
             });
         }
     }