Merge lp:~humpolec-team/humpolec/add-updateservice into lp:humpolec

[Michał Karnicki]

Add UpdateService stub.

Add UpdateService stub.
Minor clean-up (sorry about some noise, Eclipse being smart).

Unmerged revisions

61. By Michał Karnicki on 2014-03-20

Add UpdateService stub. Minor clean-up.

60. By Ondrej Kubik on 2014-03-05

Bumping up version for release

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2014-03-05 15:35:14 +0000
+++ AndroidManifest.xml	2014-03-20 15:01:59 +0000
@@ -7,13 +7,14 @@
     <uses-sdk
         android:minSdkVersion="17"
         android:targetSdkVersion="18" />
+
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -21,8 +22,8 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" />
-    <uses-permission android:name="android.permission.REBOOT"/>
-    <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
+    <uses-permission android:name="android.permission.REBOOT" />
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
 
     <application
         android:allowBackup="true"
@@ -31,9 +32,9 @@
         android:screenOrientation="portrait"
         android:theme="@android:style/Theme.Holo" >
         <activity
-            android:name=".InstallActivity"
-            android:screenOrientation="portrait"
-            android:label="@string/app_name" >
+            android:name="com.canonical.ubuntu.installer.InstallActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -41,12 +42,23 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".LaunchActivity"
-            android:screenOrientation="portrait"
-            android:label="@string/app_name">
-        </activity>
-        
-        <service android:name="com.canonical.ubuntu.installer.UbuntuInstallService">
+            android:name="com.canonical.ubuntu.installer.LaunchActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" >
+        </activity>
+
+        <activity
+            android:name="com.canonical.ubuntu.installer.UpdateActivity"
+            android:label="@string/title_activity_update" >
+        </activity>
+
+        <service android:name="com.canonical.ubuntu.installer.UbuntuInstallService" >
+            <intent-filter>
+                <action android:name="com.canonical.dualboot.ACTION_CHECK_UPDATE" />
+            </intent-filter>
+        </service>
+
+        <service android:name="com.canonical.ubuntu.installer.UbuntuInstallService" >
             <intent-filter>
                 <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.GET_CHANNEL_LIST" />
                 <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.DOWNLOAD_RELEASE" />
@@ -65,6 +77,7 @@
                 <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.IS_UBUNTU_UPGRADABLE" />
             </intent-filter>
         </service>
+
     </application>
 
 </manifest>

=== modified file 'project.properties'
--- project.properties	2013-12-12 02:02:35 +0000
+++ project.properties	2014-03-20 15:01:59 +0000
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:19
+target=android-19

=== added directory 'res/drawable-ldpi'
=== added file 'res/drawable-xhdpi/ic_stat_notify_ubuntu.png'
Binary files res/drawable-xhdpi/ic_stat_notify_ubuntu.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/ic_stat_notify_ubuntu.png	2014-03-20 15:01:59 +0000 differ
=== added file 'res/layout/activity_update.xml'
--- res/layout/activity_update.xml	1970-01-01 00:00:00 +0000
+++ res/layout/activity_update.xml	2014-03-20 15:01:59 +0000
@@ -0,0 +1,7 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.canonical.ubuntu.installer.UpdateActivity"
+    tools:ignore="MergeRootFrame" />

=== added file 'res/layout/fragment_update.xml'
--- res/layout/fragment_update.xml	1970-01-01 00:00:00 +0000
+++ res/layout/fragment_update.xml	2014-03-20 15:01:59 +0000
@@ -0,0 +1,13 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.canonical.ubuntu.installer.UpdateActivity$PlaceholderFragment" >
+    
+    <!-- TODO -->
+
+</RelativeLayout>

=== added file 'res/menu/update.xml'
--- res/menu/update.xml	1970-01-01 00:00:00 +0000
+++ res/menu/update.xml	2014-03-20 15:01:59 +0000
@@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.canonical.ubuntu.installer.UpdateActivity" >
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>

=== added directory 'res/values-w820dp'
=== added file 'res/values-w820dp/dimens.xml'
--- res/values-w820dp/dimens.xml	1970-01-01 00:00:00 +0000
+++ res/values-w820dp/dimens.xml	2014-03-20 15:01:59 +0000
@@ -0,0 +1,10 @@
+<resources>
+
+    <!--
+         Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
+    -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+
+</resources>

=== added file 'res/values/ids.xml'
--- res/values/ids.xml	1970-01-01 00:00:00 +0000
+++ res/values/ids.xml	2014-03-20 15:01:59 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * This file is part of Humpolec - Ubuntu dual boot for Android.
+ * Copyright 2014 Canonical Ltd.
+ * 
+ * Ubuntu for Android is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu for Android is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu for Android. If not, see <http://www.gnu.org/licenses/>.
+ */
+-->
+
+<resources>
+    <item type="id" name="ubuntu_update_notification" />
+</resources>
\ No newline at end of file

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2014-01-09 08:54:46 +0000
+++ res/values/strings.xml	2014-03-20 15:01:59 +0000
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="ok">OK</string>
 
-    <!--  string for InstallActivity -->
+    <!-- string for InstallActivity -->
     <string name="app_name">Ubuntu Dual Boot</string>
     <string name="action_settings">Settings</string>
     <string name="action_detele_download">Delete download</string>
@@ -39,10 +40,8 @@
     <string name="terminal_dump_succ">Dump Terminal successfully to file on sdcard</string>
     <string name="terminal_dump_fail">Dump Terminal failed to file on sdcard</string>
     <string name="external_storage_unavailable">External Storage is not available</string>
-
     <string name="not_supported_title">Not supported</string>
     <string name="not_supported_message_fmt">It appears that your device (%s) is not on the supported list of Ubuntu for Phone dual boot installer. Visit <a href="https://wiki.ubuntu.com/Touch/DualBootInstallation">https://wiki.ubuntu.com/Touch/DualBootInstallation</a> to see phones that is supported.</string>
-
     <string name="no_network_dialog_title">Network not available</string>
     <string name="enable_network">Enable WiFi</string>
 
@@ -56,5 +55,7 @@
     <string-array name="uninstall_options">
         <item>Delete user data</item>
     </string-array>
+
+    <string name="title_activity_update">UpdateActivity</string>
+
 </resources>
-

=== added directory 'src/com/canonical/dualboot'
=== added directory 'src/com/canonical/dualboot/service'
=== added file 'src/com/canonical/dualboot/service/UpdateService.java'
--- src/com/canonical/dualboot/service/UpdateService.java	1970-01-01 00:00:00 +0000
+++ src/com/canonical/dualboot/service/UpdateService.java	2014-03-20 15:01:59 +0000
@@ -0,0 +1,109 @@
+/*
+ * This file is part of Humpolec - Ubuntu dual boot for Android.
+ * Copyright 2014 Canonical Ltd.
+ * 
+ * Ubuntu for Android is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu for Android is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu for Android. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.canonical.dualboot.service;
+
+import android.app.IntentService;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Intent;
+
+import com.canonical.ubuntu.installer.R;
+import com.canonical.ubuntu.installer.UpdateActivity;
+
+public class UpdateService extends IntentService {
+	public static final String ACTION_CHECK_UPDATE =
+			"com.canonical.dualboot.ACTION_CHECK_UPDATE";
+
+	private PendingIntent mDownloadUbuntuIntent;
+	//private PendingIntent mInstallUbuntuIntent;
+	//private PendingIntent mAndroidUpdateIntent;
+
+	private Notification mUbuntuUpdateNotification;
+	//private Notification mAndroidUpdateNotification;
+
+	public UpdateService() {
+		super(UpdateService.class.getName());
+
+		 
+		Intent updateActivity = new Intent(this, UpdateActivity.class);
+		updateActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+		mDownloadUbuntuIntent = PendingIntent.getActivity(
+				this, 0, updateActivity, PendingIntent.FLAG_UPDATE_CURRENT);
+	}
+
+	@Override
+	protected void onHandleIntent(Intent intent) {
+		final String action = intent.getAction();
+		// TODO This should be launched from an alarm.
+		if (ACTION_CHECK_UPDATE.equals(action)) {
+			checkForUpdate();
+		}
+	}
+
+	private void checkForUpdate() {
+		// TODO Determine available updates based on PreferenceManager.getDefaultSharedPreferences(this);
+		boolean ubuntuUpdateAvailable = true;
+		boolean androidUpdateReady = true;
+		
+		if (ubuntuUpdateAvailable) {
+			boolean isDownloaded = false;
+			if (!isDownloaded) {
+				showDownloadUbuntuUpdateNotification();
+			} else {
+				showInstallUbuntuUpdateNotification();
+			}
+		}
+		
+		if (androidUpdateReady) {
+			showPrepareForAndroidUpdateNotification();
+		}
+	}
+
+	private void showDownloadUbuntuUpdateNotification() {
+		// TODO Extract strings.
+		Notification notification = new Notification.Builder(this)
+				.setAutoCancel(true)
+				.setSmallIcon(R.drawable.ic_stat_notify_ubuntu)
+				.setContentTitle("Ubuntu")
+				.setContentText("Ubuntu update available")
+				.setTicker("Ubuntu update available")
+				.setContentIntent(mDownloadUbuntuIntent)
+				.build();
+		
+		NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+		nm.notify(R.id.ubuntu_update_notification, notification);
+	}
+
+	private void showInstallUbuntuUpdateNotification() {
+		// TODO Add show install Ubuntu update notification.
+	}
+
+	private void showPrepareForAndroidUpdateNotification() {
+		// TODO Add show prepare for Android update notification.
+	}
+
+	@SuppressWarnings("unused")
+	private synchronized void hideUbuntuNotification() {
+		if (mUbuntuUpdateNotification != null) {
+			NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+			nm.cancel(R.id.ubuntu_update_notification);
+		}
+		mUbuntuUpdateNotification = null;
+	}
+}
\ No newline at end of file

=== modified file 'src/com/canonical/ubuntu/installer/NumberPickerDialog.java'
--- src/com/canonical/ubuntu/installer/NumberPickerDialog.java	2013-12-13 01:06:14 +0000
+++ src/com/canonical/ubuntu/installer/NumberPickerDialog.java	2014-03-20 15:01:59 +0000
@@ -1,19 +1,14 @@
 package com.canonical.ubuntu.installer;
 
-import com.canonical.ubuntu.installer.R;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.SharedPreferences;
 import android.content.DialogInterface.OnClickListener;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.CheckBox;
 import android.widget.NumberPicker;
-import android.widget.TextView;
 
 /**
  * A text picker dialog that prompts the user for to select one of the text options

=== modified file 'src/com/canonical/ubuntu/installer/TextPickerDialog.java'
--- src/com/canonical/ubuntu/installer/TextPickerDialog.java	2013-12-13 01:06:14 +0000
+++ src/com/canonical/ubuntu/installer/TextPickerDialog.java	2014-03-20 15:01:59 +0000
@@ -13,7 +13,6 @@
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.NumberPicker;
-import android.widget.TextView;
 
 /**
  * A text picker dialog that prompts the user for to select one of the text options

=== modified file 'src/com/canonical/ubuntu/installer/UbuntuInstallService.java'
--- src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2014-01-06 15:07:12 +0000
+++ src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2014-03-20 15:01:59 +0000
@@ -199,6 +199,7 @@
     };
     
     class ECancelException extends Exception {
+        private static final long serialVersionUID = 747982425589853525L;
         long mDownloadedSize;
         
         public ECancelException(long downloadedSize){
@@ -208,6 +209,8 @@
     };
 
     class ESumNotMatchException extends Exception {
+        private static final long serialVersionUID = -1356096284689475876L;
+
         public ESumNotMatchException(){
             super();
         }
@@ -218,6 +221,8 @@
     };
 
     class EShellExecException extends Exception {
+        private static final long serialVersionUID = -9010009907016301558L;
+
         public EShellExecException(){
             super();
         }

=== added file 'src/com/canonical/ubuntu/installer/UpdateActivity.java'
--- src/com/canonical/ubuntu/installer/UpdateActivity.java	1970-01-01 00:00:00 +0000
+++ src/com/canonical/ubuntu/installer/UpdateActivity.java	2014-03-20 15:01:59 +0000
@@ -0,0 +1,64 @@
+package com.canonical.ubuntu.installer;
+
+import android.app.Activity;
+import android.app.ActionBar;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.os.Build;
+
+public class UpdateActivity extends Activity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_update);
+
+		if (savedInstanceState == null) {
+			getFragmentManager().beginTransaction()
+					.add(R.id.container, new PlaceholderFragment()).commit();
+		}
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.update, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		// Handle action bar item clicks here. The action bar will
+		// automatically handle clicks on the Home/Up button, so long
+		// as you specify a parent activity in AndroidManifest.xml.
+		int id = item.getItemId();
+		if (id == R.id.action_settings) {
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	/**
+	 * A placeholder fragment containing a simple view.
+	 */
+	public static class PlaceholderFragment extends Fragment {
+
+		public PlaceholderFragment() {
+		}
+
+		@Override
+		public View onCreateView(LayoutInflater inflater, ViewGroup container,
+				Bundle savedInstanceState) {
+			View rootView = inflater.inflate(R.layout.fragment_update,
+					container, false);
+			return rootView;
+		}
+	}
+
+}

=== modified file 'src/com/canonical/ubuntu/installer/Utils.java'
--- src/com/canonical/ubuntu/installer/Utils.java	2014-01-09 08:54:46 +0000
+++ src/com/canonical/ubuntu/installer/Utils.java	2014-03-20 15:01:59 +0000
@@ -180,7 +180,6 @@
         return size;
     }
 
-    @SuppressWarnings("deprecation")
     public static long getFreeSpaceInBytes(String fsPath) {
         StatFs stats = new StatFs(fsPath);
         // not using getAvailableBytes() for it's not available in android 4.2