mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

- fix #667

Browse source
This commit is contained in:
tobiasKaminsky 2015-01-01 13:55:06 +01:00
parent 30b332745d
commit 5345fed890
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/owncloud/android/ui/activity/PinCodeActivity.java
View file

@ -366,7 +366,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
}
if (mPinCodeChecked &&
(mActivity.equals("FileDisplayActivity") || mActivity.equals("PreviewImageActivity"))){
(mActivity.equals("FileDisplayActivity") || mActivity.equals("PreviewImageActivity") || mActivity.equals("ownCloudUploader"))){
PinCheck.setUnlockTimestamp();
finish();
} else if (mPinCodeChecked){

25
src/com/owncloud/android/ui/activity/Uploader.java
View file

@ -26,14 +26,6 @@ import java.util.List;
import java.util.Stack;
import java.util.Vector;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.lib.common.utils.Log_OC;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.app.AlertDialog;
@ -65,6 +57,14 @@ import android.widget.Toast;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockListActivity;
import com.actionbarsherlock.view.MenuItem;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.authentication.PinCheck;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.utils.DisplayUtils;
/**
@ -96,7 +96,14 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mParents = new Stack<String>();
// Check Pin entry
if (PinCheck.checkIfPinEntry()){
Intent i = new Intent(MainApp.getAppContext(), PinCodeActivity.class);
i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "ownCloudUploader");
startActivity(i);
}
ActionBar actionBar = getSupportActionBar();
actionBar.setIcon(DisplayUtils.getSeasonalIconId());