Merge lp:~karni/ubuntuone-android-files/handling-expired-tokens into lp:ubuntuone-android-files

[Michał Karnicki]

I've allowed myself to throw in a couple smaller fixes on the way, please review by commit.

467 - main focus of this branch. Notify the user if an upload fails in background. If the app is in foreground, http 401 is already handled by local broadcast.

TESTED:
Sign in.
Upload a picture.
Remove token from o.u.c/account.
Upload a picture. Notice it fails, "Please reauthenticate" notification shows up.
Press the notification, sign in.
Note in the logs the retry failed alarm re-registered.

468 - (requested by nessita) Make the soft 'ok' button equivalent to pressing 'Sign in' when entering a password.

TESTED:
On sign in form, use the soft 'Ok' button when entering password. The sign in process continues.

469 - Avoid useless roaming notification, when "Only on Wi-Fi" is selected. It's a one liner I didn't test, I am confident it behaves as I expect.

470 - Removed a widget we don't have time to maintain, which used to crash some devices.

TESTED:
Reinstalled the app. Note the widget is no longer visible in the "widgets" screen on my Nexus 4.

[Mike McCracken (mikemc)]

This all looks reasonable. I am not set up to build or test this, so this is just a read-through review.

review: Approve (sanity check)

[Michał Karnicki (karni)]

Thanks Mike. This will go through QA, I'll make sure of that.

=== modified file '.classpath'
--- .classpath	2012-05-18 15:49:21 +0000
+++ .classpath	2013-11-15 15:02:42 +0000
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2013-02-22 17:51:47 +0000
+++ AndroidManifest.xml	2013-11-15 15:02:42 +0000
@@ -215,19 +215,6 @@
 		</activity>
 		-->
 		
-		<activity
-			android:name=".activity.ShortcutsActivity"
-			android:theme="@style/Theme.Transparent"
-			android:exported="false">
-			
-			<intent-filter>
-				<action android:name="android.intent.action.CREATE_SHORTCUT" />
-				<action android:name="com.ubuntuone.android.files.ACTION_START" />
-				<action android:name="com.ubuntuone.android.files.ACTION_UPLOAD_MEDIA_NOW" />
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
-		</activity>
-		
 		<service
 			android:name=".authenticator.AuthenticationService"
 			android:exported="true" >

=== modified file 'res/layout/fragment_sign_in.xml'
--- res/layout/fragment_sign_in.xml	2013-02-22 17:51:47 +0000
+++ res/layout/fragment_sign_in.xml	2013-11-15 15:02:42 +0000
@@ -97,7 +97,8 @@
                 android:textColor="@color/text_dark_grey"
                 android:textSize="@dimen/text_size_smaller"
                 u1f:customFont="Ubuntu-B.ttf"
-                android:text="@string/password" />
+                android:text="@string/password"
+                android:imeOptions="actionDone" />
             
             <include
                 android:id="@+id/password_error"

=== modified file 'res/values/ids.xml'
--- res/values/ids.xml	2012-08-06 20:03:41 +0000
+++ res/values/ids.xml	2013-11-15 15:02:42 +0000
@@ -12,6 +12,7 @@
 	<item type="id" name="stat_failed_download_id" />
 	<item type="id" name="stat_roaming_autoupload_off_id" />
 	<item type="id" name="stat_quota_exceeded_id" />
+	<item type="id" name="stat_please_reauthenticate" />
 	
 	<item type="id" name="context_download" />
 	<item type="id" name="context_cancel_download" />

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2013-02-28 16:17:43 +0000
+++ res/values/strings.xml	2013-11-15 15:02:42 +0000
@@ -80,6 +80,9 @@
     <string name="one_account_only">Currently only one Ubuntu One account is supported. If you wish to sign in as a different user, please remove the old account first.</string>
     <string name="authentication_error">Authentication failed. Probably credentials you have provided are incorrect.</string>
     <string name="connectivity_error">Connection is down or service is unavailable. Please try again later.</string>
+    
+    <string name="please_reauthenticate">Please reauthenticate.</string>
+    <string name="you_have_been_signed_out">You have been signed out.</string>
 
     <!-- Files activity -->
     <string name="files_activity_label">Ubuntu One Files</string> <!-- DNT -->

=== modified file 'src/com/ubuntuone/android/files/activity/FilesActivity.java'
--- src/com/ubuntuone/android/files/activity/FilesActivity.java	2013-02-22 17:51:47 +0000
+++ src/com/ubuntuone/android/files/activity/FilesActivity.java	2013-11-15 15:02:42 +0000
@@ -88,6 +88,7 @@
 import com.ubuntuone.android.files.provider.TransfersContract.Downloads;
 import com.ubuntuone.android.files.service.MetaService;
 import com.ubuntuone.android.files.service.MetaService.Status;
+import com.ubuntuone.android.files.service.AutoUploadService;
 import com.ubuntuone.android.files.service.MetaServiceHelper;
 import com.ubuntuone.android.files.service.UpDownService;
 import com.ubuntuone.android.files.service.UpDownService.OnDownloadListener;
@@ -163,6 +164,7 @@
 	private Handler mHandler;
 	private DetachableResultReceiver mReceiver;
 	private SignOutBroadcastReceiver mSignOutReceiver;
+	private boolean mSignOutReceiverRegistered = false;
 	
 	private ContentResolver mResolver;
 	
@@ -202,12 +204,6 @@
 		mHandler = new Handler();
 		mReceiver = new DetachableResultReceiver(mHandler);
 		
-		mSignOutReceiver = new SignOutBroadcastReceiver();
-		IntentFilter intentFilter =
-				new IntentFilter("com.ubuntuone.android.files.SIGN_OUT");
-		LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
-		lbm.registerReceiver(mSignOutReceiver, intentFilter);
-		
 		mResolver = getContentResolver();
 		
 		// Override splash screen background.
@@ -296,6 +292,8 @@
 	private void suggestAutoUploadConfiguration() {
 		if (!Preferences.isPhotoUploadConfigured()) {
 			startActivity(new Intent(this, AutoUploadSetupActivity.class));
+		} else if (Preferences.isPhotoUploadEnabled()) {
+			AutoUploadService.startFrom(this);
 		}
 	}
 	
@@ -374,6 +372,7 @@
 				hideSpinner();
 			}
 		}
+		registerSignOutReceiver();
 		setCursorAdapterInBackground();
 	}
 	
@@ -415,6 +414,7 @@
 
 	@Override
 	protected void onPause() {
+		unregisterSignOutReceiver();
 		if (mReceiver != null) {
 			mReceiver.detach();
 		}
@@ -423,9 +423,6 @@
 	
 	@Override
 	public void onDestroy() {
-		LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
-		lbm.unregisterReceiver(mSignOutReceiver);
-		
 		if (mTracker != null) {
 			mTracker.dispatch();
 			mTracker.stop();
@@ -879,6 +876,7 @@
 		mUploadGrid.show(v);
 	}
 	
+	@SuppressWarnings("unused")
 	private void onActionBarSettingsClicked() {
 		PreferencesActivity.showFrom(this);
 	}
@@ -1918,6 +1916,25 @@
 		}
 	}
 	
+	private void registerSignOutReceiver() {
+		if (mSignOutReceiver == null || !mSignOutReceiverRegistered) {
+			mSignOutReceiver = new SignOutBroadcastReceiver();
+			IntentFilter intentFilter =
+					new IntentFilter("com.ubuntuone.android.files.SIGN_OUT");
+			LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
+			lbm.registerReceiver(mSignOutReceiver, intentFilter);
+			mSignOutReceiverRegistered = true;
+		}
+	}
+
+	private void unregisterSignOutReceiver() {
+		if (mSignOutReceiver != null && mSignOutReceiverRegistered) {
+			LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
+			lbm.unregisterReceiver(mSignOutReceiver);
+			mSignOutReceiverRegistered = false;
+		}
+	}
+	
 	private class SignOutBroadcastReceiver extends BroadcastReceiver {
 		@Override
 		public void onReceive(Context context, Intent intent) {

=== modified file 'src/com/ubuntuone/android/files/fragment/SignInFragment.java'
--- src/com/ubuntuone/android/files/fragment/SignInFragment.java	2013-02-22 17:51:47 +0000
+++ src/com/ubuntuone/android/files/fragment/SignInFragment.java	2013-11-15 15:02:42 +0000
@@ -31,17 +31,23 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
 
 import com.google.android.apps.analytics.GoogleAnalyticsTracker;
+import com.ubuntuone.android.files.Alarms;
 import com.ubuntuone.android.files.Analytics;
 import com.ubuntuone.android.files.Constants;
 import com.ubuntuone.android.files.Preferences;
 import com.ubuntuone.android.files.R;
+import com.ubuntuone.android.files.service.AutoUploadService;
 import com.ubuntuone.android.files.util.AuthenticateUserTask;
 import com.ubuntuone.android.files.util.AuthenticateUserTask.AuthenticateUserTaskCallback;
 import com.ubuntuone.android.files.util.Log;
@@ -120,6 +126,16 @@
 		signInButton = (ButtonPlus) content.findViewById(R.id.sign_in);
 		
 		signInButton.setOnClickListener(onButtonClickedListener);
+		passwordEditText.setOnEditorActionListener(new OnEditorActionListener() {
+			@Override
+			public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+				if (actionId == EditorInfo.IME_ACTION_DONE) {
+					onSignInButtonClicked();
+					return true;
+				}
+				return false;
+			}
+		});
 	}
 
 	private OnClickListener onButtonClickedListener = new OnClickListener() {
@@ -252,6 +268,19 @@
 		mTracker.trackEvent("Referee", Analytics.REFERRER, "login", 1);
 		
 		final Activity activity = getActivity();
+		if (activity != null) {
+			// In case we have reauthenticated:
+			
+			// Retry failed uploads.
+			Alarms.maybeRegisterRetryFailedAlarm();
+			
+			// Restart AutoUploadService.
+			if (Preferences.isPhotoUploadConfigured() &&
+					Preferences.isPhotoUploadEnabled()) {
+				AutoUploadService.startFrom(getActivity());
+			}
+		}
+		
 		activity.setResult(Activity.RESULT_OK);
 		activity.finish();
 	}

=== modified file 'src/com/ubuntuone/android/files/service/UpDownService.java'
--- src/com/ubuntuone/android/files/service/UpDownService.java	2013-02-02 13:25:05 +0000
+++ src/com/ubuntuone/android/files/service/UpDownService.java	2013-11-15 15:02:42 +0000
@@ -61,6 +61,7 @@
 import com.ubuntuone.android.files.R;
 import com.ubuntuone.android.files.UbuntuOneFiles;
 import com.ubuntuone.android.files.activity.FilesActivity;
+import com.ubuntuone.android.files.activity.LoginActivity;
 import com.ubuntuone.android.files.activity.PreferencesActivity;
 import com.ubuntuone.android.files.provider.MetaContract.Nodes;
 import com.ubuntuone.android.files.provider.MetaContract.ResourceState;
@@ -451,7 +452,10 @@
 					TransferState.QUEUED, TransferState.WAITING);
 			
 			if (networkStatusReceiver.isRoaming() && !uploadAlsoWhenRoaming) {
-				notifyRoamingSoAutoUploadDisabled();
+				// The notification is useless if 'Only on Wi-Fi' is set.
+				if (!Preferences.getAutoUploadOnlyOnWiFi()) {
+					notifyRoamingSoAutoUploadDisabled();
+				}
 			}
 		}
 	}
@@ -708,7 +712,7 @@
 						TransferState.QUEUED, TransferState.WAITING);
 				
 				recentFailedUploadCount++;
-				onFailureCallback(failure);	
+				onFailureCallback(failure);
 			}
 		}
 
@@ -727,6 +731,7 @@
 			resolver.update(uri, values, null, null);
 			
 			recentFailedUploadCount++;
+
 			onFailureCallback(failure);
 		}
 
@@ -1118,6 +1123,7 @@
 		// TODO log failure status codes in GA
 		switch (failure.getStatusCode()) {
 		case HttpStatus.SC_UNAUTHORIZED:
+			showReauthenticateNotification();
 			onUnauthorizedResponse();
 			break;
 		case HttpStatus.SC_PAYMENT_REQUIRED:
@@ -1200,6 +1206,28 @@
 		
 		notificationManager.notify(R.id.stat_failed_upload_id, notification);
 	}
+
+	private void showReauthenticateNotification() {
+		final String title = getString(R.string.please_reauthenticate);
+		final String text = getString(R.string.you_have_been_signed_out);
+
+		final Intent intent = new Intent(
+				UpDownService.this, LoginActivity.class);
+		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+		final PendingIntent pi = PendingIntent.getActivity(
+				getApplicationContext(), 0, intent, 0);
+
+		Notification notification = new NotificationCompat.Builder(this)
+				.setOngoing(false)
+				.setTicker(title)
+				.setSmallIcon(R.drawable.stat_u1_logo)
+				.setOnlyAlertOnce(true)
+				.setAutoCancel(true)
+				.build();
+		notification.setLatestEventInfo(this, title, text, pi);
+
+		notificationManager.notify(R.id.stat_please_reauthenticate, notification);
+	}
 	
 	public interface IdleListener {
 		public void isIdle();