import android.content.DialogInterface.OnClickListener;\r
import android.content.Intent;\r
import android.content.IntentFilter;\r
+import android.content.SharedPreferences;\r
import android.content.pm.PackageInfo;\r
import android.content.pm.PackageManager.NameNotFoundException;\r
import android.database.Cursor;\r
import android.net.Uri;\r
import android.os.Bundle;\r
+import android.preference.PreferenceManager;\r
import android.provider.MediaStore;\r
import android.support.v4.app.FragmentTransaction;\r
import android.util.Log;\r
super.onCreate(savedInstanceState);\r
\r
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
- setSupportProgressBarIndeterminateVisibility(false);\r
\r
Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
\r
if(savedInstanceState != null) {\r
mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
- mDirectories.add("/");\r
+ mDirectories.add(OCFile.PATH_SEPARATOR);\r
if (mDirs != null)\r
for (String s : mDirs)\r
mDirectories.insert(s, 0);\r
\r
initDelayedTilAccountAvailabe();\r
\r
+ // PIN CODE request ; best location is to decide, let's try this first\r
+ //if (savedInstanceState == null) {\r
+ if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
+ requestPinCode();\r
+ }\r
+ \r
+ \r
} else {\r
\r
setContentView(R.layout.no_account_available);\r
getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);\r
findViewById(R.id.setup_account).setOnClickListener(this);\r
- \r
+\r
+ setSupportProgressBarIndeterminateVisibility(false);\r
+\r
Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
startActivity(intent); // although the code is here, the activity won't be created until this.onStart() and this.onResume() are finished;\r
break;\r
}\r
case R.id.startSync: {\r
+ ContentResolver.cancelSync(null, "org.owncloud"); // cancel the current synchronizations of any ownCloud account\r
Bundle bundle = new Bundle();\r
bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
ContentResolver.requestSync(\r
AccountUtils.getCurrentOwnCloudAccount(this));\r
String remotepath = new String();\r
for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
- remotepath += "/" + mDirectories.getItem(j);\r
+ remotepath += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);\r
}\r
- if (!remotepath.endsWith("/"))\r
- remotepath += "/";\r
+ if (!remotepath.endsWith(OCFile.PATH_SEPARATOR))\r
+ remotepath += OCFile.PATH_SEPARATOR;\r
remotepath += new File(filepath).getName();\r
- remotepath = Uri.encode(remotepath, "/");\r
\r
i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
for (String s : mDirs)\r
mDirectories.add(s);\r
} else {\r
- mDirectories.add("/");\r
+ mDirectories.add(OCFile.PATH_SEPARATOR);\r
}\r
\r
// Actionbar setup\r
String path;\r
if (mCurrentDir == null) {\r
// this is just a patch; we should ensure that mCurrentDir never is null\r
- if (!mStorageManager.fileExists("/")) {\r
- OCFile file = new OCFile("/");\r
+ if (!mStorageManager.fileExists(OCFile.PATH_SEPARATOR)) {\r
+ OCFile file = new OCFile(OCFile.PATH_SEPARATOR);\r
mStorageManager.saveFile(file);\r
}\r
- mCurrentDir = mStorageManager.getFileByPath("/");\r
+ mCurrentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);\r
}\r
path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r
\r
// Create directory\r
- path += Uri.encode(directoryName) + "/";\r
+ path += directoryName + OCFile.PATH_SEPARATOR;\r
Thread thread = new Thread(new DirectoryCreator(path, a));\r
thread.start();\r
\r
Log.d("FileDisplay", "sync of account " + account_name\r
+ " is in_progress: " + inProgress);\r
\r
- //if (account_name.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) { // TODO - probably this check should be added, but won't push it until really tests are done; no time now\r
+ if (account_name.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) { \r
\r
- /// try to refresh the view with every message received from the FileSyncAdapter; brute, but more user friendly when there are a lot of files in the server\r
- OCFile currentDir;\r
- if (mCurrentDir == null)\r
- currentDir = mStorageManager.getFileByPath("/");\r
- else\r
- currentDir = mStorageManager.getFileByPath(mCurrentDir.getRemotePath());\r
- \r
- if (currentDir != null) {\r
- mCurrentDir = currentDir;\r
+ String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); \r
+ \r
+ boolean fillBlankRoot = false;\r
+ if (mCurrentDir == null) {\r
+ mCurrentDir = mStorageManager.getFileByPath("/");\r
+ fillBlankRoot = (mCurrentDir != null);\r
+ }\r
+\r
+ if (synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath) || fillBlankRoot) ) {\r
FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r
.findFragmentById(R.id.fileList);\r
+ mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);\r
if (fileListFragment != null) {\r
- if (!mCurrentDir.equals(fileListFragment.getCurrentFile())) {\r
- fileListFragment.listDirectory(mCurrentDir); // only set the directory in the fragment first time\r
- } else\r
- fileListFragment.listDirectory(); // enough to show new files in the current directory if they are added after \r
+ fileListFragment.listDirectory(mCurrentDir); \r
}\r
}\r
\r
setSupportProgressBarIndeterminateVisibility(inProgress);\r
- //}\r
+ \r
+ }\r
}\r
}\r
\r
\r
// If we are on a large device -> update fragment\r
if (mDualPane) {\r
- // buttons in the details view a are problematic when trying to reuse an existing fragment; create always a new one solves some of them, BUT no all; downloads are 'dangerous'\r
+ // buttons in the details view are problematic when trying to reuse an existing fragment; create always a new one solves some of them, BUT no all; downloads are 'dangerous'\r
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);\r
transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
transaction.commit();\r
}\r
+ setSupportProgressBarIndeterminateVisibility(false);\r
+ }\r
+ \r
\r
+ /**\r
+ * Launch an intent to request the PIN code to the user before letting him use the app\r
+ */\r
+ private void requestPinCode() {\r
+ boolean pinStart = false;\r
+ SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());\r
+ pinStart = appPrefs.getBoolean("set_pincode", false);\r
+ if (pinStart) {\r
+ Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);\r
+ i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity");\r
+ startActivity(i);\r
+ }\r
}\r
\r
\r
projects / pub / Android / ownCloud.git / blobdiff