gotostack
diff --git a/‎src/com/owncloud/android/files/services/FileUploader.java
Lines changed: 1 addition & 0 deletions b/‎src/com/owncloud/android/files/services/FileUploader.java
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/com/owncloud/android/ui/activity/FileActivity.java
Lines changed: 13 additions & 0 deletions b/‎src/com/owncloud/android/ui/activity/FileActivity.java
Lines changed: 13 additions & 0 deletions
diff --git a/‎src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Lines changed: 2 additions & 0 deletions b/‎src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Lines changed: 2 additions & 0 deletions
@@ -787,6 +787,7 @@ private void notifyUploadResult(RemoteOperationResult uploadResult, UploadFileOp
             }
             showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, upload.getFile());
             showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, upload.getAccount());
+            showDetailsIntent.putExtra(FileActivity.EXTRA_FROM_NOTIFICATION, true);
             showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(),
                     (int) System.currentTimeMillis(), showDetailsIntent, 0);
 
@@ -47,6 +47,7 @@ public abstract class FileActivity extends SherlockFragmentActivity {
     public static final String EXTRA_FILE = "com.owncloud.android.ui.activity.FILE";
     public static final String EXTRA_ACCOUNT = "com.owncloud.android.ui.activity.ACCOUNT";
     public static final String EXTRA_WAITING_TO_PREVIEW = "com.owncloud.android.ui.activity.WAITING_TO_PREVIEW";
+    public static final String EXTRA_FROM_NOTIFICATION= "com.owncloud.android.ui.activity.FROM_NOTIFICATION";
 
     public static final String TAG = FileActivity.class.getSimpleName(); 
 
@@ -65,6 +66,9 @@ public abstract class FileActivity extends SherlockFragmentActivity {
 
     /** Flag to signal when the value of mAccount was restored from a saved state */ 
     private boolean mAccountWasRestored;
+    
+    /** Flag to signal if the activity is launched by a notification */
+    private boolean mFromNotification;
 
 
     /**
@@ -82,9 +86,11 @@ protected void onCreate(Bundle savedInstanceState) {
         if(savedInstanceState != null) {
             account = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
             mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE);
+            mFromNotification = savedInstanceState.getBoolean(FileActivity.EXTRA_FROM_NOTIFICATION);
         } else {
             account = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT);
             mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE);
+            mFromNotification = getIntent().getBooleanExtra(FileActivity.EXTRA_FROM_NOTIFICATION, false);
         }
 
         setAccount(account, savedInstanceState != null);
@@ -191,6 +197,7 @@ protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putParcelable(FileActivity.EXTRA_FILE, mFile);
         outState.putParcelable(FileActivity.EXTRA_ACCOUNT, mAccount);
+        outState.putBoolean(FileActivity.EXTRA_FROM_NOTIFICATION, mFromNotification);
     }
 
 
@@ -223,6 +230,12 @@ public Account getAccount() {
         return mAccount;
     }
 
+    /**
+     * @return Value of mFromNotification: True if the Activity is launched by a notification
+     */
+    public boolean fromNotification() {
+        return mFromNotification;
+    }
 
     /**
      * @return  'True' when the Activity is finishing to enforce the setup of a new account.
 
@@ -162,6 +162,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // PIN CODE request ;  best location is to decide, let's try this first
         if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {
             requestPinCode();
+        } else if (getIntent().getAction() == null) {
+            requestPinCode();
         }
 
         /// file observer
Original file line number	Diff line number	Diff line change
`@@ -787,6 +787,7 @@ private void notifyUploadResult(RemoteOperationResult uploadResult, UploadFileOp`
`787`	`787`	`}`
`788`	`788`	`showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, upload.getFile());`
`789`	`789`	`showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, upload.getAccount());`
	`790`	`+ showDetailsIntent.putExtra(FileActivity.EXTRA_FROM_NOTIFICATION, true);`
`790`	`791`	`showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);`
`791`	`792`	`mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(),`
`792`	`793`	`(int) System.currentTimeMillis(), showDetailsIntent, 0);`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,8 @@ protected void onCreate(Bundle savedInstanceState) {`
`162`	`162`	`// PIN CODE request ; best location is to decide, let's try this first`
`163`	`163`	`if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {`
`164`	`164`	`requestPinCode();`
	`165`	`+ } else if (getIntent().getAction() == null) {`
	`166`	`+ requestPinCode();`
`165`	`167`	`}`
`166`	`168`
`167`	`169`	`/// file observer`