fix after rebase

This commit is contained in:
Andy Scherzinger 2016-04-14 11:34:49 +02:00
parent 8b04d61ff4
commit 1f4e9aa439

View file

@ -35,6 +35,7 @@ import android.content.IntentFilter;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Resources.NotFoundException;
import android.os.Bundle;
import android.os.Parcelable;
@ -456,7 +457,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
}
private Vector<OCFile> sortFileList(Vector<OCFile> files) {
SharedPreferences sharedPreferences = PreferenceManager
SharedPreferences sharedPreferences = android.preference.PreferenceManager
.getDefaultSharedPreferences(this);
// Read sorting order, default to sort by name ascending