Ubuntu One Android Files

Merge lp:~cmiller/ubuntuone-android-files/build-setup into lp:ubuntuone-android-files/first-draft

  1. build-setup
  2. Merge into trunk
Proposed by Chad Miller
Status: Merged
Merged at revision: 90
Proposed branch: lp:~cmiller/ubuntuone-android-files/build-setup
Merge into: lp:ubuntuone-android-files/first-draft
Diff against target: 1713 lines (+308/-828)
34 files modified
.bzrignore (+11/-0)
AndroidManifest.xml (+8/-8)
build.xml (+90/-0)
gen/com/ubuntuone/androidu1/IAndroidU1.java (+0/-241)
gen/com/ubuntuone/androidu1/R.java (+0/-204)
gen/com/ubuntuone/androidu1/service/IU1Service.java (+0/-262)
res/raw/help (+8/-8)
res/raw/intro (+12/-9)
res/values/application.xml (+1/-1)
res/values/preferences.xml (+4/-4)
res/xml/preferences.xml (+1/-1)
setup (+87/-0)
src/com/ubuntuone/android/files/AndroidU1.java (+2/-2)
src/com/ubuntuone/android/files/FilesList.java (+13/-13)
src/com/ubuntuone/android/files/FilesListCursorAdapter.java (+5/-5)
src/com/ubuntuone/android/files/IAndroidU1.aidl (+1/-1)
src/com/ubuntuone/android/files/Preferences.java (+11/-15)
src/com/ubuntuone/android/files/net/INetworkListener.java (+1/-1)
src/com/ubuntuone/android/files/net/NetworkObserver.java (+2/-2)
src/com/ubuntuone/android/files/provider/U1CloudProvider.java (+5/-5)
src/com/ubuntuone/android/files/provider/U1CloudProviderUtils.java (+5/-5)
src/com/ubuntuone/android/files/service/IU1Service.aidl (+2/-2)
src/com/ubuntuone/android/files/service/U1Client.java (+7/-7)
src/com/ubuntuone/android/files/service/U1Service.java (+10/-10)
src/com/ubuntuone/android/files/sso/SSO.java (+4/-4)
src/com/ubuntuone/android/files/util/BrowserUtilities.java (+1/-1)
src/com/ubuntuone/android/files/util/ChangeLogUtils.java (+4/-4)
src/com/ubuntuone/android/files/util/ConfigUtilities.java (+1/-1)
src/com/ubuntuone/android/files/util/DateUtilities.java (+1/-1)
src/com/ubuntuone/android/files/util/DialogUtils.java (+1/-1)
src/com/ubuntuone/android/files/util/FileUtils.java (+1/-1)
src/com/ubuntuone/android/files/util/LogCollector.java (+2/-2)
src/com/ubuntuone/android/files/util/OAuthUtilities.java (+4/-4)
src/com/ubuntuone/android/files/util/U1HttpUtilities.java (+3/-3)
To merge this branch: bzr merge lp:~cmiller/ubuntuone-android-files/build-setup
Reviewer Review Type Date Requested Status
Michał Karnicki (community) Approve
Review via email: mp+39163@code.launchpad.net
To post a comment you must log in.
lp:~cmiller/ubuntuone-android-files/build-setup updated
81. By Chad Miller

Drop "none" test, reorder to prefer wget over curl, and make wget emit error messages.

Quote filenames to b3 robust.

82. By Chad Miller

Require netty. Use different sources.

83. By Chad Miller

File test.

Get netty from right location.

84. By Chad Miller

Version 1.2.1.1 of signpost-core is buggy. Step back to 1.2.

85. By Chad Miller

Don't use commons-codec? It appears to be unnecessary (and ignored!) on Android 2.2.

86. By Chad Miller

Smarter bzrignore, using regular expressions.

87. By Chad Miller

Remove more jar files that we can download.

88. By Chad Miller

Download oauth files. Try latest version.

89. By Chad Miller

Kill "AndroidU1" name in docs.

90. By Chad Miller

Send questions to Launchpad Answers instead of MK's email.

Revision history for this message
Michał Karnicki (karni) wrote :

Nice work Chad, ant setup (including the setup file) looks really good and works great. It's now really easy to build the project. I'd introduce little changes to naming conventions (Ubuntu One Android Files instead of Ubuntu One File Sync), however [like we discussed] this is related to this branch only by accident, so let's leave it for another branch.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2010-06-14 20:21:54 +0000
+++ .bzrignore 2010-10-26 16:39:53 +0000
@@ -1,1 +1,12 @@
1bin1bin
2local.properties
3gen
4RE:libs/commons-codec-\d.*.jar
5RE:libs/netty-\d.*.jar
6RE:libs/oauth-consumer-\d.*.jar
7RE:libs/oauth-\d.*.jar
8RE:libs/protobuf-java-\d.*.jar
9RE:libs/signpost-commonshttp4-\d.*.jar
10RE:libs/signpost-core-\d.*.jar
11RE:libs/storageprotocol-\d.*.jar
12RE:libs/oauth-\d.*.jar
213
=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml 2010-08-16 00:16:56 +0000
+++ AndroidManifest.xml 2010-10-26 16:39:53 +0000
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="utf-8"?>1<?xml version="1.0" encoding="utf-8"?>
2<manifest2<manifest
3 xmlns:android="http://schemas.android.com/apk/res/android"3 xmlns:android="http://schemas.android.com/apk/res/android"
4 package="com.ubuntuone.androidu1"4 package="com.ubuntuone.android.files"
5 android:versionCode="43"5 android:versionCode="43"
6 android:versionName="0.4.4b" >6 android:versionName="0.4.4b" >
7 7
@@ -28,14 +28,14 @@
28 android:process=":remote" >28 android:process=":remote" >
29 29
30 <intent-filter>30 <intent-filter>
31 <action android:name="com.ubuntuone.androidu1.service.ACTION_START" />31 <action android:name="com.ubuntuone.android.files.service.ACTION_START" />
32 <action android:name="com.ubuntuone.androidu1.service.ACTION_STOP" />32 <action android:name="com.ubuntuone.android.files.service.ACTION_STOP" />
33 </intent-filter>33 </intent-filter>
34 </service>34 </service>
35 35
36 <provider36 <provider
37 android:name=".provider.U1CloudProvider"37 android:name=".provider.U1CloudProvider"
38 android:authorities="com.ubuntuone.androidu1.provider.u1cloudprovider" />38 android:authorities="com.ubuntuone.android.files.provider.u1cloudprovider" />
39 39
40 <activity40 <activity
41 android:name=".FilesList"41 android:name=".FilesList"
@@ -44,7 +44,7 @@
44 android:label="@string/fileslist_title" >44 android:label="@string/fileslist_title" >
45 45
46 <intent-filter46 <intent-filter
47 android:label="AndroidU1" >47 android:label="@string/app_name" >
48 <action android:name="android.intent.action.MAIN" />48 <action android:name="android.intent.action.MAIN" />
49 <category android:name="android.intent.category.LAUNCHER" />49 <category android:name="android.intent.category.LAUNCHER" />
50 </intent-filter>50 </intent-filter>
@@ -53,7 +53,7 @@
53 <action android:name="android.intent.action.VIEW" />53 <action android:name="android.intent.action.VIEW" />
54 <category android:name="android.intent.category.DEFAULT" />54 <category android:name="android.intent.category.DEFAULT" />
55 <category android:name="android.intent.category.BROWSABLE" />55 <category android:name="android.intent.category.BROWSABLE" />
56 <data android:scheme="x-androidu1" />56 <data android:scheme="x-ubuntuone-files" />
57 </intent-filter>57 </intent-filter>
58 </activity>58 </activity>
59 59
@@ -65,7 +65,7 @@
65 <action android:name="android.intent.action.VIEW" />65 <action android:name="android.intent.action.VIEW" />
66 <category android:name="android.intent.category.DEFAULT" />66 <category android:name="android.intent.category.DEFAULT" />
67 <category android:name="android.intent.category.BROWSABLE" />67 <category android:name="android.intent.category.BROWSABLE" />
68 <data android:scheme="x-androidu1-sso" />68 <data android:scheme="x-ubuntuone-files-sso" />
69 </intent-filter>69 </intent-filter>
70 </activity>70 </activity>
7171
@@ -76,4 +76,4 @@
76 </activity>76 </activity>
77 </application>77 </application>
78 78
79</manifest>
80\ No newline at end of file79\ No newline at end of file
80</manifest>
8181
=== added file 'build.xml'
--- build.xml 1970-01-01 00:00:00 +0000
+++ build.xml 2010-10-26 16:39:53 +0000
@@ -0,0 +1,90 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<project name="ubuntu-one-file-sync" default="debug">
3
4 <!-- The local.properties file is created and updated by the 'android' tool.
5 It contains the path to the SDK. It should *NOT* be checked in in Version
6 Control Systems. -->
7 <property file="local.properties" />
8
9 <!-- The build.properties file can be created by you and is never touched
10 by the 'android' tool. This is the place to change some of the default property values
11 used by the Ant rules.
12 Here are some properties you may want to change/update:
13
14 application.package
15 the name of your application package as defined in the manifest. Used by the
16 'uninstall' rule.
17 source.dir
18 the name of the source directory. Default is 'src'.
19 out.dir
20 the name of the output directory. Default is 'bin'.
21
22 Properties related to the SDK location or the project target should be updated
23 using the 'android' tool with the 'update' action.
24
25 This file is an integral part of the build system for your application and
26 should be checked in in Version Control Systems.
27
28 -->
29 <property file="build.properties" />
30
31 <!-- The default.properties file is created and updated by the 'android' tool, as well
32 as ADT.
33 This file is an integral part of the build system for your application and
34 should be checked in in Version Control Systems. -->
35 <property file="default.properties" />
36
37 <!-- Custom Android task to deal with the project target, and import the proper rules.
38 This requires ant 1.6.0 or above. -->
39 <path id="android.antlibs">
40 <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
41 <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
42 <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
43 <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
44 <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
45 </path>
46
47 <taskdef name="setup"
48 classname="com.android.ant.SetupTask"
49 classpathref="android.antlibs" />
50
51 <!-- Execute the Android Setup task that will setup some properties specific to the target,
52 and import the build rules files.
53
54 The rules file is imported from
55 <SDK>/platforms/<target_platform>/templates/android_rules.xml
56
57 To customize some build steps for your project:
58 - copy the content of the main node <project> from android_rules.xml
59 - paste it in this build.xml below the <setup /> task.
60 - disable the import by changing the setup task below to <setup import="false" />
61
62 This will ensure that the properties are setup correctly but that your customized
63 build steps are used.
64 -->
65 <setup />
66
67
68
69 <!-- Compiles this project's .java files into .class files. -->
70 <target name="compile" depends="-resource-src, -aidl"
71 description="Compiles project's .java files into .class files">
72 <!-- If android rules are used for a test project, its classpath should include
73 tested project's location -->
74 <condition property="extensible.classpath"
75 value="${tested.project.absolute.dir}/bin/classes" else=".">
76 <isset property="tested.project.absolute.dir" />
77 </condition>
78 <javac encoding="utf-8" target="1.5" debug="true" extdirs=""
79 destdir="${out.classes.absolute.dir}"
80 bootclasspathref="android.target.classpath"
81 verbose="${verbose}" classpath="${extensible.classpath}">
82 <src path="${source.absolute.dir}" />
83 <src path="${gen.absolute.dir}" />
84 <classpath>
85 <fileset dir="${external.libs.absolute.dir}" includes="*.jar" />
86 </classpath>
87 </javac>
88 </target>
89
90</project>
091
=== removed directory 'gen'
=== removed directory 'gen/com'
=== removed directory 'gen/com/ubuntuone'
=== removed directory 'gen/com/ubuntuone/androidu1'
=== removed file 'gen/com/ubuntuone/androidu1/IAndroidU1.java'
--- gen/com/ubuntuone/androidu1/IAndroidU1.java 2010-08-12 23:20:10 +0000
+++ gen/com/ubuntuone/androidu1/IAndroidU1.java 1970-01-01 00:00:00 +0000
@@ -1,241 +0,0 @@
1/*
2 * This file is auto-generated. DO NOT MODIFY.
3 * Original file: /home/mike/src/android/AndroidU1/src/com/ubuntuone/androidu1/IAndroidU1.aidl
4 */
5package com.ubuntuone.androidu1;
6public interface IAndroidU1 extends android.os.IInterface
7{
8/** Local-side IPC implementation stub class. */
9public static abstract class Stub extends android.os.Binder implements com.ubuntuone.androidu1.IAndroidU1
10{
11private static final java.lang.String DESCRIPTOR = "com.ubuntuone.androidu1.IAndroidU1";
12/** Construct the stub at attach it to the interface. */
13public Stub()
14{
15this.attachInterface(this, DESCRIPTOR);
16}
17/**
18 * Cast an IBinder object into an com.ubuntuone.androidu1.IAndroidU1 interface,
19 * generating a proxy if needed.
20 */
21public static com.ubuntuone.androidu1.IAndroidU1 asInterface(android.os.IBinder obj)
22{
23if ((obj==null)) {
24return null;
25}
26android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
27if (((iin!=null)&&(iin instanceof com.ubuntuone.androidu1.IAndroidU1))) {
28return ((com.ubuntuone.androidu1.IAndroidU1)iin);
29}
30return new com.ubuntuone.androidu1.IAndroidU1.Stub.Proxy(obj);
31}
32public android.os.IBinder asBinder()
33{
34return this;
35}
36@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
37{
38switch (code)
39{
40case INTERFACE_TRANSACTION:
41{
42reply.writeString(DESCRIPTOR);
43return true;
44}
45case TRANSACTION_onGotRoot:
46{
47data.enforceInterface(DESCRIPTOR);
48java.lang.String _arg0;
49_arg0 = data.readString();
50this.onGotRoot(_arg0);
51reply.writeNoException();
52return true;
53}
54case TRANSACTION_onUpdateDirContentsDone:
55{
56data.enforceInterface(DESCRIPTOR);
57java.lang.String _arg0;
58_arg0 = data.readString();
59this.onUpdateDirContentsDone(_arg0);
60reply.writeNoException();
61return true;
62}
63case TRANSACTION_onFileDownloaded:
64{
65data.enforceInterface(DESCRIPTOR);
66long _arg0;
67_arg0 = data.readLong();
68this.onFileDownloaded(_arg0);
69reply.writeNoException();
70return true;
71}
72case TRANSACTION_onFileUploaded:
73{
74data.enforceInterface(DESCRIPTOR);
75long _arg0;
76_arg0 = data.readLong();
77this.onFileUploaded(_arg0);
78reply.writeNoException();
79return true;
80}
81case TRANSACTION_onServiceIsWorking:
82{
83data.enforceInterface(DESCRIPTOR);
84this.onServiceIsWorking();
85reply.writeNoException();
86return true;
87}
88case TRANSACTION_onServiceIsIdle:
89{
90data.enforceInterface(DESCRIPTOR);
91this.onServiceIsIdle();
92reply.writeNoException();
93return true;
94}
95case TRANSACTION_onNotifyState:
96{
97data.enforceInterface(DESCRIPTOR);
98int _arg0;
99_arg0 = data.readInt();
100this.onNotifyState(_arg0);
101reply.writeNoException();
102return true;
103}
104}
105return super.onTransact(code, data, reply, flags);
106}
107private static class Proxy implements com.ubuntuone.androidu1.IAndroidU1
108{
109private android.os.IBinder mRemote;
110Proxy(android.os.IBinder remote)
111{
112mRemote = remote;
113}
114public android.os.IBinder asBinder()
115{
116return mRemote;
117}
118public java.lang.String getInterfaceDescriptor()
119{
120return DESCRIPTOR;
121}
122public void onGotRoot(java.lang.String root) throws android.os.RemoteException
123{
124android.os.Parcel _data = android.os.Parcel.obtain();
125android.os.Parcel _reply = android.os.Parcel.obtain();
126try {
127_data.writeInterfaceToken(DESCRIPTOR);
128_data.writeString(root);
129mRemote.transact(Stub.TRANSACTION_onGotRoot, _data, _reply, 0);
130_reply.readException();
131}
132finally {
133_reply.recycle();
134_data.recycle();
135}
136}
137public void onUpdateDirContentsDone(java.lang.String node) throws android.os.RemoteException
138{
139android.os.Parcel _data = android.os.Parcel.obtain();
140android.os.Parcel _reply = android.os.Parcel.obtain();
141try {
142_data.writeInterfaceToken(DESCRIPTOR);
143_data.writeString(node);
144mRemote.transact(Stub.TRANSACTION_onUpdateDirContentsDone, _data, _reply, 0);
145_reply.readException();
146}
147finally {
148_reply.recycle();
149_data.recycle();
150}
151}
152public void onFileDownloaded(long id) throws android.os.RemoteException
153{
154android.os.Parcel _data = android.os.Parcel.obtain();
155android.os.Parcel _reply = android.os.Parcel.obtain();
156try {
157_data.writeInterfaceToken(DESCRIPTOR);
158_data.writeLong(id);
159mRemote.transact(Stub.TRANSACTION_onFileDownloaded, _data, _reply, 0);
160_reply.readException();
161}
162finally {
163_reply.recycle();
164_data.recycle();
165}
166}
167public void onFileUploaded(long id) throws android.os.RemoteException
168{
169android.os.Parcel _data = android.os.Parcel.obtain();
170android.os.Parcel _reply = android.os.Parcel.obtain();
171try {
172_data.writeInterfaceToken(DESCRIPTOR);
173_data.writeLong(id);
174mRemote.transact(Stub.TRANSACTION_onFileUploaded, _data, _reply, 0);
175_reply.readException();
176}
177finally {
178_reply.recycle();
179_data.recycle();
180}
181}
182public void onServiceIsWorking() throws android.os.RemoteException
183{
184android.os.Parcel _data = android.os.Parcel.obtain();
185android.os.Parcel _reply = android.os.Parcel.obtain();
186try {
187_data.writeInterfaceToken(DESCRIPTOR);
188mRemote.transact(Stub.TRANSACTION_onServiceIsWorking, _data, _reply, 0);
189_reply.readException();
190}
191finally {
192_reply.recycle();
193_data.recycle();
194}
195}
196public void onServiceIsIdle() throws android.os.RemoteException
197{
198android.os.Parcel _data = android.os.Parcel.obtain();
199android.os.Parcel _reply = android.os.Parcel.obtain();
200try {
201_data.writeInterfaceToken(DESCRIPTOR);
202mRemote.transact(Stub.TRANSACTION_onServiceIsIdle, _data, _reply, 0);
203_reply.readException();
204}
205finally {
206_reply.recycle();
207_data.recycle();
208}
209}
210public void onNotifyState(int state) throws android.os.RemoteException
211{
212android.os.Parcel _data = android.os.Parcel.obtain();
213android.os.Parcel _reply = android.os.Parcel.obtain();
214try {
215_data.writeInterfaceToken(DESCRIPTOR);
216_data.writeInt(state);
217mRemote.transact(Stub.TRANSACTION_onNotifyState, _data, _reply, 0);
218_reply.readException();
219}
220finally {
221_reply.recycle();
222_data.recycle();
223}
224}
225}
226static final int TRANSACTION_onGotRoot = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
227static final int TRANSACTION_onUpdateDirContentsDone = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
228static final int TRANSACTION_onFileDownloaded = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
229static final int TRANSACTION_onFileUploaded = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
230static final int TRANSACTION_onServiceIsWorking = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
231static final int TRANSACTION_onServiceIsIdle = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
232static final int TRANSACTION_onNotifyState = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
233}
234public void onGotRoot(java.lang.String root) throws android.os.RemoteException;
235public void onUpdateDirContentsDone(java.lang.String node) throws android.os.RemoteException;
236public void onFileDownloaded(long id) throws android.os.RemoteException;
237public void onFileUploaded(long id) throws android.os.RemoteException;
238public void onServiceIsWorking() throws android.os.RemoteException;
239public void onServiceIsIdle() throws android.os.RemoteException;
240public void onNotifyState(int state) throws android.os.RemoteException;
241}
2420
=== removed file 'gen/com/ubuntuone/androidu1/R.java'
--- gen/com/ubuntuone/androidu1/R.java 2010-08-15 18:01:00 +0000
+++ gen/com/ubuntuone/androidu1/R.java 1970-01-01 00:00:00 +0000
@@ -1,204 +0,0 @@
1/* AUTO-GENERATED FILE. DO NOT MODIFY.
2 *
3 * This class was automatically generated by the
4 * aapt tool from the resource data it found. It
5 * should not be modified by hand.
6 */
7
8package com.ubuntuone.androidu1;
9
10public final class R {
11 public static final class anim {
12 public static final int files_list_row_animation=0x7f040000;
13 public static final int item_ready_animation=0x7f040001;
14 }
15 public static final class attr {
16 }
17 public static final class drawable {
18 public static final int android_icon=0x7f020000;
19 public static final int file=0x7f020001;
20 public static final int folder=0x7f020002;
21 public static final int ic_menu_refresh=0x7f020003;
22 public static final int launcher=0x7f020004;
23 public static final int list_selector=0x7f020005;
24 public static final int mime_image=0x7f020006;
25 public static final int mime_music=0x7f020007;
26 public static final int mime_pdf=0x7f020008;
27 public static final int mime_video=0x7f020009;
28 public static final int star=0x7f02000a;
29 }
30 public static final class id {
31 public static final int changelog_scroll=0x7f090000;
32 public static final int changelog_text=0x7f090001;
33 public static final int download_file=0x7f09000f;
34 public static final int filename=0x7f090007;
35 public static final int icon=0x7f090005;
36 public static final int lastsync=0x7f090008;
37 public static final int loginButton=0x7f090003;
38 public static final int loginDescription=0x7f090004;
39 public static final int loginImage=0x7f090002;
40 public static final int online_group=0x7f090010;
41 public static final int open_directory=0x7f09001b;
42 public static final int open_file=0x7f09000e;
43 public static final int option_exit=0x7f09001a;
44 public static final int option_help=0x7f090018;
45 public static final int option_preferences=0x7f090019;
46 public static final int option_refresh=0x7f090011;
47 public static final int option_search=0x7f090017;
48 public static final int option_upload=0x7f090012;
49 public static final int option_upload_any=0x7f090016;
50 public static final int option_upload_audio=0x7f090015;
51 public static final int option_upload_image=0x7f090013;
52 public static final int option_upload_video=0x7f090014;
53 public static final int size=0x7f090009;
54 public static final int ssoAcceptButton=0x7f09000d;
55 public static final int ssoClient=0x7f09000a;
56 public static final int ssoDescription=0x7f09000b;
57 public static final int ssoRejectButton=0x7f09000c;
58 public static final int star=0x7f090006;
59 }
60 public static final class layout {
61 public static final int changelog=0x7f030000;
62 public static final int login=0x7f030001;
63 public static final int main=0x7f030002;
64 public static final int row=0x7f030003;
65 public static final int sso=0x7f030004;
66 }
67 public static final class menu {
68 public static final int file_context_menu=0x7f080000;
69 public static final int files_list_options_menu=0x7f080001;
70 public static final int folder_context_menu=0x7f080002;
71 }
72 public static final class raw {
73 public static final int changelog=0x7f060000;
74 public static final int help=0x7f060001;
75 public static final int intro=0x7f060002;
76 }
77 public static final class string {
78 public static final int about=0x7f07004e;
79 public static final int about_service=0x7f070007;
80 public static final int about_summary=0x7f07004f;
81 public static final int ack=0x7f070053;
82 public static final int app_desc=0x7f070001;
83 public static final int app_name=0x7f070000;
84 /** Application
85 */
86 public static final int application=0x7f070045;
87 public static final int background_service=0x7f070039;
88 public static final int background_service_summary_off=0x7f07003b;
89 public static final int background_service_summary_on=0x7f07003a;
90 public static final int change_after_restart=0x7f070058;
91 public static final int contact_developer=0x7f070049;
92 public static final int contact_developer_summary=0x7f07004a;
93 public static final int context_delete_text=0x7f07001b;
94 public static final int context_download_text=0x7f070018;
95 /** context menu
96 */
97 public static final int context_open_text=0x7f070017;
98 public static final int context_rename_text=0x7f07001a;
99 public static final int context_sync_text=0x7f070019;
100 /** About::Development
101 */
102 public static final int development=0x7f070050;
103 public static final int email=0x7f070030;
104 public static final int fetch_token_failed=0x7f070003;
105 /** files list
106 feching_data ~ getting files and folders list
107 */
108 public static final int fetching_data=0x7f070015;
109 public static final int file_is_downloading=0x7f07000b;
110 public static final int fileslist_title=0x7f070002;
111 public static final int help=0x7f070047;
112 public static final int help_summary=0x7f070048;
113 /** Other
114 */
115 public static final int hint=0x7f070057;
116 public static final int keep_service_default=0x7f07005b;
117 public static final int license_summary=0x7f070051;
118 public static final int list_sort=0x7f070033;
119 public static final int login_adding_device=0x7f070014;
120 /** login screen
121 */
122 public static final int login_button_text=0x7f070012;
123 public static final int login_desc_text=0x7f070013;
124 /** Manage
125 */
126 public static final int manage_account=0x7f07003c;
127 public static final int manage_online=0x7f070041;
128 public static final int manage_online_summary=0x7f070042;
129 public static final int more_info=0x7f070055;
130 public static final int no_connection_available=0x7f070004;
131 /** no_data ~ no files and no folders
132 */
133 public static final int no_data=0x7f070016;
134 public static final int no_file_selected=0x7f07000d;
135 public static final int no_suitable_connection_available=0x7f070005;
136 public static final int not_yet_available=0x7f07000a;
137 public static final int option_exit_text=0x7f070025;
138 public static final int option_exit_text_short=0x7f070026;
139 public static final int option_help_text=0x7f070023;
140 /** options menu
141 */
142 public static final int option_refresh_text=0x7f07001c;
143 public static final int option_search_text=0x7f070022;
144 public static final int option_settings_text=0x7f070024;
145 public static final int option_upload_any_text=0x7f070021;
146 public static final int option_upload_audio_text=0x7f070020;
147 public static final int option_upload_image_text=0x7f07001e;
148 public static final int option_upload_text=0x7f07001d;
149 public static final int option_upload_video_text=0x7f07001f;
150 /** Options
151 */
152 public static final int options=0x7f070032;
153 public static final int pick_audio_with=0x7f070011;
154 /** upload picker
155 */
156 public static final int pick_image_with=0x7f07000f;
157 public static final int pick_video_with=0x7f070010;
158 public static final int plan=0x7f070031;
159 public static final int preferences_title=0x7f07002b;
160 public static final int refreshing=0x7f07000c;
161 public static final int reg_with_service_failed=0x7f070008;
162 public static final int remove_device=0x7f07003d;
163 public static final int remove_device_summary=0x7f07003e;
164 public static final int remove_missing=0x7f070036;
165 public static final int remove_missing_default=0x7f07005a;
166 public static final int remove_missing_summary_off=0x7f070038;
167 public static final int remove_missing_summary_on=0x7f070037;
168 public static final int send_logs=0x7f07004b;
169 public static final int send_logs_summary=0x7f07004c;
170 /** when the service has disconnected without known reason
171 */
172 public static final int service_lost=0x7f070009;
173 public static final int service_not_connected=0x7f070006;
174 public static final int service_notification=0x7f07005c;
175 /** Default values
176 */
177 public static final int sort=0x7f070059;
178 public static final int sort_alphabetical_label=0x7f070034;
179 public static final int sort_folders_first_label=0x7f070035;
180 public static final int support_options=0x7f070043;
181 public static final int support_options_summary=0x7f070044;
182 public static final int tag_animated=0x7f07002a;
183 public static final int tag_filename=0x7f070028;
184 public static final int tag_status=0x7f070029;
185 public static final int tag_type=0x7f070027;
186 public static final int tap_for_changelog=0x7f070046;
187 public static final int tap_to_refresh=0x7f07002e;
188 public static final int thanks=0x7f070054;
189 public static final int translation=0x7f070052;
190 /** Ubuntu One Account
191 */
192 public static final int ubuntu_one_account=0x7f07002c;
193 public static final int unknown_value=0x7f07002d;
194 public static final int upgrade_subscription=0x7f07003f;
195 public static final int upgrade_subscription_summary=0x7f070040;
196 public static final int uploading=0x7f07000e;
197 public static final int username=0x7f07002f;
198 public static final int version=0x7f07004d;
199 public static final int webpage=0x7f070056;
200 }
201 public static final class xml {
202 public static final int preferences=0x7f050000;
203 }
204}
2050
=== removed directory 'gen/com/ubuntuone/androidu1/service'
=== removed file 'gen/com/ubuntuone/androidu1/service/IU1Service.java'
--- gen/com/ubuntuone/androidu1/service/IU1Service.java 2010-08-15 18:01:00 +0000
+++ gen/com/ubuntuone/androidu1/service/IU1Service.java 1970-01-01 00:00:00 +0000
@@ -1,262 +0,0 @@
1/*
2 * This file is auto-generated. DO NOT MODIFY.
3 * Original file: /home/mike/src/android/AndroidU1/src/com/ubuntuone/androidu1/service/IU1Service.aidl
4 */
5package com.ubuntuone.androidu1.service;
6public interface IU1Service extends android.os.IInterface
7{
8/** Local-side IPC implementation stub class. */
9public static abstract class Stub extends android.os.Binder implements com.ubuntuone.androidu1.service.IU1Service
10{
11private static final java.lang.String DESCRIPTOR = "com.ubuntuone.androidu1.service.IU1Service";
12/** Construct the stub at attach it to the interface. */
13public Stub()
14{
15this.attachInterface(this, DESCRIPTOR);
16}
17/**
18 * Cast an IBinder object into an com.ubuntuone.androidu1.service.IU1Service interface,
19 * generating a proxy if needed.
20 */
21public static com.ubuntuone.androidu1.service.IU1Service asInterface(android.os.IBinder obj)
22{
23if ((obj==null)) {
24return null;
25}
26android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
27if (((iin!=null)&&(iin instanceof com.ubuntuone.androidu1.service.IU1Service))) {
28return ((com.ubuntuone.androidu1.service.IU1Service)iin);
29}
30return new com.ubuntuone.androidu1.service.IU1Service.Stub.Proxy(obj);
31}
32public android.os.IBinder asBinder()
33{
34return this;
35}
36@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
37{
38switch (code)
39{
40case INTERFACE_TRANSACTION:
41{
42reply.writeString(DESCRIPTOR);
43return true;
44}
45case TRANSACTION_registerCallback:
46{
47data.enforceInterface(DESCRIPTOR);
48com.ubuntuone.androidu1.IAndroidU1 _arg0;
49_arg0 = com.ubuntuone.androidu1.IAndroidU1.Stub.asInterface(data.readStrongBinder());
50this.registerCallback(_arg0);
51reply.writeNoException();
52return true;
53}
54case TRANSACTION_unregisterCallback:
55{
56data.enforceInterface(DESCRIPTOR);
57com.ubuntuone.androidu1.IAndroidU1 _arg0;
58_arg0 = com.ubuntuone.androidu1.IAndroidU1.Stub.asInterface(data.readStrongBinder());
59this.unregisterCallback(_arg0);
60reply.writeNoException();
61return true;
62}
63case TRANSACTION_isConnected:
64{
65data.enforceInterface(DESCRIPTOR);
66boolean _result = this.isConnected();
67reply.writeNoException();
68reply.writeInt(((_result)?(1):(0)));
69return true;
70}
71case TRANSACTION_setNetworkType:
72{
73data.enforceInterface(DESCRIPTOR);
74int _arg0;
75_arg0 = data.readInt();
76this.setNetworkType(_arg0);
77reply.writeNoException();
78return true;
79}
80case TRANSACTION_updateDirContents:
81{
82data.enforceInterface(DESCRIPTOR);
83java.lang.String _arg0;
84_arg0 = data.readString();
85this.updateDirContents(_arg0);
86reply.writeNoException();
87return true;
88}
89case TRANSACTION_downloadFile:
90{
91data.enforceInterface(DESCRIPTOR);
92long _arg0;
93_arg0 = data.readLong();
94this.downloadFile(_arg0);
95reply.writeNoException();
96return true;
97}
98case TRANSACTION_uploadFile:
99{
100data.enforceInterface(DESCRIPTOR);
101android.net.Uri _arg0;
102if ((0!=data.readInt())) {
103_arg0 = android.net.Uri.CREATOR.createFromParcel(data);
104}
105else {
106_arg0 = null;
107}
108java.lang.String _arg1;
109_arg1 = data.readString();
110this.uploadFile(_arg0, _arg1);
111reply.writeNoException();
112return true;
113}
114}
115return super.onTransact(code, data, reply, flags);
116}
117private static class Proxy implements com.ubuntuone.androidu1.service.IU1Service
118{
119private android.os.IBinder mRemote;
120Proxy(android.os.IBinder remote)
121{
122mRemote = remote;
123}
124public android.os.IBinder asBinder()
125{
126return mRemote;
127}
128public java.lang.String getInterfaceDescriptor()
129{
130return DESCRIPTOR;
131}
132public void registerCallback(com.ubuntuone.androidu1.IAndroidU1 au1) throws android.os.RemoteException
133{
134android.os.Parcel _data = android.os.Parcel.obtain();
135android.os.Parcel _reply = android.os.Parcel.obtain();
136try {
137_data.writeInterfaceToken(DESCRIPTOR);
138_data.writeStrongBinder((((au1!=null))?(au1.asBinder()):(null)));
139mRemote.transact(Stub.TRANSACTION_registerCallback, _data, _reply, 0);
140_reply.readException();
141}
142finally {
143_reply.recycle();
144_data.recycle();
145}
146}
147public void unregisterCallback(com.ubuntuone.androidu1.IAndroidU1 au1) throws android.os.RemoteException
148{
149android.os.Parcel _data = android.os.Parcel.obtain();
150android.os.Parcel _reply = android.os.Parcel.obtain();
151try {
152_data.writeInterfaceToken(DESCRIPTOR);
153_data.writeStrongBinder((((au1!=null))?(au1.asBinder()):(null)));
154mRemote.transact(Stub.TRANSACTION_unregisterCallback, _data, _reply, 0);
155_reply.readException();
156}
157finally {
158_reply.recycle();
159_data.recycle();
160}
161}
162public boolean isConnected() throws android.os.RemoteException
163{
164android.os.Parcel _data = android.os.Parcel.obtain();
165android.os.Parcel _reply = android.os.Parcel.obtain();
166boolean _result;
167try {
168_data.writeInterfaceToken(DESCRIPTOR);
169mRemote.transact(Stub.TRANSACTION_isConnected, _data, _reply, 0);
170_reply.readException();
171_result = (0!=_reply.readInt());
172}
173finally {
174_reply.recycle();
175_data.recycle();
176}
177return _result;
178}
179public void setNetworkType(int type) throws android.os.RemoteException
180{
181android.os.Parcel _data = android.os.Parcel.obtain();
182android.os.Parcel _reply = android.os.Parcel.obtain();
183try {
184_data.writeInterfaceToken(DESCRIPTOR);
185_data.writeInt(type);
186mRemote.transact(Stub.TRANSACTION_setNetworkType, _data, _reply, 0);
187_reply.readException();
188}
189finally {
190_reply.recycle();
191_data.recycle();
192}
193}
194public void updateDirContents(java.lang.String node) throws android.os.RemoteException
195{
196android.os.Parcel _data = android.os.Parcel.obtain();
197android.os.Parcel _reply = android.os.Parcel.obtain();
198try {
199_data.writeInterfaceToken(DESCRIPTOR);
200_data.writeString(node);
201mRemote.transact(Stub.TRANSACTION_updateDirContents, _data, _reply, 0);
202_reply.readException();
203}
204finally {
205_reply.recycle();
206_data.recycle();
207}
208}
209public void downloadFile(long id) throws android.os.RemoteException
210{
211android.os.Parcel _data = android.os.Parcel.obtain();
212android.os.Parcel _reply = android.os.Parcel.obtain();
213try {
214_data.writeInterfaceToken(DESCRIPTOR);
215_data.writeLong(id);
216mRemote.transact(Stub.TRANSACTION_downloadFile, _data, _reply, 0);
217_reply.readException();
218}
219finally {
220_reply.recycle();
221_data.recycle();
222}
223}
224public void uploadFile(android.net.Uri uri, java.lang.String path) throws android.os.RemoteException
225{
226android.os.Parcel _data = android.os.Parcel.obtain();
227android.os.Parcel _reply = android.os.Parcel.obtain();
228try {
229_data.writeInterfaceToken(DESCRIPTOR);
230if ((uri!=null)) {
231_data.writeInt(1);
232uri.writeToParcel(_data, 0);
233}
234else {
235_data.writeInt(0);
236}
237_data.writeString(path);
238mRemote.transact(Stub.TRANSACTION_uploadFile, _data, _reply, 0);
239_reply.readException();
240}
241finally {
242_reply.recycle();
243_data.recycle();
244}
245}
246}
247static final int TRANSACTION_registerCallback = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
248static final int TRANSACTION_unregisterCallback = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
249static final int TRANSACTION_isConnected = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
250static final int TRANSACTION_setNetworkType = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
251static final int TRANSACTION_updateDirContents = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
252static final int TRANSACTION_downloadFile = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
253static final int TRANSACTION_uploadFile = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
254}
255public void registerCallback(com.ubuntuone.androidu1.IAndroidU1 au1) throws android.os.RemoteException;
256public void unregisterCallback(com.ubuntuone.androidu1.IAndroidU1 au1) throws android.os.RemoteException;
257public boolean isConnected() throws android.os.RemoteException;
258public void setNetworkType(int type) throws android.os.RemoteException;
259public void updateDirContents(java.lang.String node) throws android.os.RemoteException;
260public void downloadFile(long id) throws android.os.RemoteException;
261public void uploadFile(android.net.Uri uri, java.lang.String path) throws android.os.RemoteException;
262}
2630
=== removed file 'lib/commons-codec-1.3.jar'
264Binary files lib/commons-codec-1.3.jar 2010-05-28 21:54:30 +0000 and lib/commons-codec-1.3.jar 1970-01-01 00:00:00 +0000 differ1Binary files lib/commons-codec-1.3.jar 2010-05-28 21:54:30 +0000 and lib/commons-codec-1.3.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/json_simple-1.0.2.jar'
265Binary files lib/json_simple-1.0.2.jar 2010-06-26 00:31:33 +0000 and lib/json_simple-1.0.2.jar 1970-01-01 00:00:00 +0000 differ2Binary files lib/json_simple-1.0.2.jar 2010-06-26 00:31:33 +0000 and lib/json_simple-1.0.2.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/signpost-commonshttp4-1.2.jar'
266Binary files lib/signpost-commonshttp4-1.2.jar 2010-06-01 03:32:25 +0000 and lib/signpost-commonshttp4-1.2.jar 1970-01-01 00:00:00 +0000 differ3Binary files lib/signpost-commonshttp4-1.2.jar 2010-06-01 03:32:25 +0000 and lib/signpost-commonshttp4-1.2.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/signpost-core-1.2.jar'
267Binary files lib/signpost-core-1.2.jar 2010-06-01 03:32:25 +0000 and lib/signpost-core-1.2.jar 1970-01-01 00:00:00 +0000 differ4Binary files lib/signpost-core-1.2.jar 2010-06-01 03:32:25 +0000 and lib/signpost-core-1.2.jar 1970-01-01 00:00:00 +0000 differ
=== renamed directory 'lib' => 'libs'
=== modified file 'res/raw/help'
--- res/raw/help 2010-08-15 18:01:00 +0000
+++ res/raw/help 2010-10-26 16:39:53 +0000
@@ -1,4 +1,4 @@
1<small><b>Basics of AndroidU1</b>1<small><b>Basics of Ubuntu One File Sync</b>
22
3<u>Browse</u>3<u>Browse</u>
44
@@ -15,18 +15,18 @@
1515
16<b>Support</b>16<b>Support</b>
1717
18<u>AndroidU1 support</u>18<u>Ubuntu One File Sync support</u>
1919
20For AndroidU1 related support, visit the project page at <i>http://wiki.ubuntu.com/AndroidU1</i> or jump into <i>irc.freenode.net #androidu1</i>20For Ubuntu One File Sync support, visit the project page at <i>http://answers.launchpad.com/ubuntuone-android-files</i> or jump into <i>irc.freenode.net #ubuntuone</i>
2121
22<u>Ubuntu One support</u>22<u>Ubuntu One support</u>
2323
24For Ubuntu One related support, visit <i>Menu > Settings > Ubuntu One Support</i>.24For Ubuntu One related support, visit <i>Menu &gt; Settings &gt; Ubuntu One Support</i>.
2525
2626
27<b>About the service</b>27<b>About the service</b>
2828
29AndroidU1 gives you access to Ubuntu One cloud storage. Since Ubuntu One is all about sync (that feature is work in progress), AndroidU1 is supported by a background service. It's job is to complete your file transfers and perform any necessary sync (WIP). If you do not want to leave that service in background, make sure to shut it down by closing application with <i>Menu > Stop sync</i>. However, you may interrupt your transfers.29Ubuntu One File Sync gives you access to Ubuntu One cloud storage. Since Ubuntu One is all about sync (that feature is work in progress), Ubuntu One File Sync is supported by a background service. Its job is to complete your file transfers and perform any necessary sync (WIP). If you do not want to leave that service in background, make sure to shut it down by closing application with <i>Menu > Stop sync</i>. However, you may interrupt your transfers.
3030
3131
32<b>Troubleshooting</b>32<b>Troubleshooting</b>
@@ -36,9 +36,9 @@
3636
37<b>Final words</b>37<b>Final words</b>
3838
39I hope you'll enjoy using AndroidU1. It's still under development and there are many great features to come!39I hope you'll enjoy using Ubuntu One File Sync. It's still under development and there are many great features to come!
4040
41You can mail me from <i>Menu > Settings > About</i> or join us to share comments and ideas on <i>irc.freenode.net #androidu1</i>.41You can mail me from <i>Menu &gt; Settings &gt; About</i> or join us to share comments and ideas on <i>irc.freenode.net #ubuntuone</i>.
4242
43Project page:43Project page:
44http://wiki.ubuntu.com/AndroidU1</small>
45\ No newline at end of file44\ No newline at end of file
45http://wiki.ubuntu.com/AndroidU1</small>
4646
=== modified file 'res/raw/intro'
--- res/raw/intro 2010-08-15 18:01:00 +0000
+++ res/raw/intro 2010-10-26 16:39:53 +0000
@@ -1,24 +1,27 @@
1<small>Thanks for installing <b>AndroidU1</b>!1<small>Thanks for installing
2<b>Ubuntu One File Sync</b>!
23
3<u>Please read this carefully.</u>4<u>Please read this carefully.</u>
45
5<b>AndroidU1</b> gives you access6<b>Ubuntu One File Sync</b> gives
6to <b>Ubuntu One</b> cloud storage.7you access to <b>Ubuntu One</b>
8cloud storage.
79
8Since Ubuntu One is all about10Since Ubuntu One is all about
9synchronization (that feature is11synchronization (that feature is
10work in progress), AndroidU1 is12work in progress), Ubuntu One
11supported by a background service.13File sync is supported by a
14background service.
1215
13It's job is to complete your16Its job is to complete your
14file transfers and perform17file transfers and perform
15any necessary sync (WIP).18any necessary sync.
16If you do not want to leave that19If you do not want to leave that
17service in background, make sure20service in background, make sure
18to shut it down by closing21to shut it down by closing
19application with <i>Menu > Stop sync</i>.22application with <i>Menu &gt; Stop sync</i>.
2023
21Enjoy!24Enjoy!
2225
23For more details, visit26For more details, visit
24<i>Menu > Help</i></small>
25\ No newline at end of file27\ No newline at end of file
28<i>Menu &gt; Help</i></small>
2629
=== modified file 'res/values/application.xml'
--- res/values/application.xml 2010-08-06 14:57:16 +0000
+++ res/values/application.xml 2010-10-26 16:39:53 +0000
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="utf-8"?>1<?xml version="1.0" encoding="utf-8"?>
2<resources>2<resources>
3 <string name="app_name">AndroidU1</string>3 <string name="app_name">Ubuntu One File Sync</string>
4 <string name="app_desc">Access Ubuntu One storage, share files and folders, sync.</string>4 <string name="app_desc">Access Ubuntu One storage, share files and folders, sync.</string>
5</resources>5</resources>
66
=== modified file 'res/values/preferences.xml'
--- res/values/preferences.xml 2010-08-15 18:01:00 +0000
+++ res/values/preferences.xml 2010-10-26 16:39:53 +0000
@@ -51,15 +51,15 @@
51 <string name="help">Help</string>51 <string name="help">Help</string>
52 <string name="help_summary">Instructions, FAQ, etc.</string>52 <string name="help_summary">Instructions, FAQ, etc.</string>
53 53
54 <string name="contact_developer">Contact developer</string>54 <string name="contact_developer">Ask questions</string>
55 <string name="contact_developer_summary">Your feedback is most welcome.</string>55 <string name="contact_developer_summary">Questions and feedback are welcome.</string>
56 56
57 <string name="send_logs">Send logs</string>57 <string name="send_logs">Send logs</string>
58 <string name="send_logs_summary">Problems? Share your logs with me.</string>58 <string name="send_logs_summary">Problems? Share your logs with developers.</string>
59 59
60 <string name="version">Version</string>60 <string name="version">Version</string>
61 61
62 <string name="about">About AndroidU1</string>62 <string name="about">About Ubuntu One File Sync</string>
63 <string name="about_summary"></string>63 <string name="about_summary"></string>
64 64
65 <!-- About::Development -->65 <!-- About::Development -->
6666
=== modified file 'res/xml/preferences.xml'
--- res/xml/preferences.xml 2010-08-15 18:01:00 +0000
+++ res/xml/preferences.xml 2010-10-26 16:39:53 +0000
@@ -59,7 +59,7 @@
59<Preference android:key="community" android:title="Ubuntu Community" android:summary="Thank you for all support!" android:selectable="false"></Preference>59<Preference android:key="community" android:title="Ubuntu Community" android:summary="Thank you for all support!" android:selectable="false"></Preference>
60</PreferenceCategory>60</PreferenceCategory>
6161
62<PreferenceCategory android:key="more_info" android:title="@string/more_info"><Preference android:title="@string/webpage" android:key="webpage" android:summary="https://launchpad.net/androidu1"></Preference>62<PreferenceCategory android:key="more_info" android:title="@string/more_info"><Preference android:title="@string/webpage" android:key="webpage" android:summary="https://launchpad.net/ubuntuone-android-files"></Preference>
63</PreferenceCategory>63</PreferenceCategory>
64</PreferenceScreen>64</PreferenceScreen>
6565
6666
=== added file 'setup'
--- setup 1970-01-01 00:00:00 +0000
+++ setup 2010-10-26 16:39:53 +0000
@@ -0,0 +1,87 @@
1#!/bin/sh
2
3## TODO: One day, move all this into the build.xml file. The file tests are ripe for use by ant.
4
5if test "$1" = "cleanlib"; then
6 rm libs/*
7 bzr revert libs/
8fi
9
10PROJECTROOT=$(bzr root || pwd)
11
12ANDROIDBIN=$(which android)
13if test -z "${DOWNLOADER}"; then which wget >/dev/null && DOWNLOADER="$(which wget) --no-verbose -O "; fi
14if test -z "${DOWNLOADER}"; then which curl >/dev/null && DOWNLOADER="$(which curl) -o "; fi
15
16if test -z "${ANDROIDBIN}"; then
17 echo "Android SDK tools not in PATH." >&2
18 echo " PATH=\$PATH:/PathToSDK/tools" >&2
19 return 1
20fi
21
22if test -z "${DOWNLOADER}"; then
23 echo "Need wget or curl to download." >&2
24 return 1
25fi
26
27trap "echo ' ==== Not Successful. ===='" EXIT
28set -e
29
30echo "Downloading dependencies."
31cd "${PROJECTROOT}"/libs
32
33generaldownload() {
34 local filename=$1
35 local urlstart=$2
36 echo " - ${filename}"
37 if test -f "${filename}" && file "${filename}" |grep -i "zip archive" >/dev/null; then
38 :
39 else
40 rm -f "${filename}"
41 ${DOWNLOADER} "${filename}" "${urlstart}/${filename}"
42 fi
43 file "${filename}" |grep -i "zip archive" >/dev/null
44 return $?
45}
46
47mavendownload() {
48 local groupid=$1
49 local artifactid=$2
50 local vers=$3
51 generaldownload \
52 "${artifactid}-${vers}.jar" \
53 "http://mirrors.ibiblio.org/pub/mirrors/maven2/${groupid}/${artifactid}/${vers}"
54 return $?
55}
56
57
58nexusdownload() {
59 local groupid=$1
60 local artifactid=$2
61 local vers=$3
62 generaldownload \
63 "${artifactid}-${vers}.jar" \
64 "http://repository.jboss.org/nexus/content/groups/public-jboss/${groupid}/${artifactid}/${vers}"
65 return $?
66}
67
68# If you add new downloadable jar files here, please add a wildcard to
69# ".bzrignore" to match it in libs/ , and "bzr remove" the existing file if
70# it's in the branch.
71nexusdownload "org/jboss/netty" "netty" "3.1.5.GA"
72mavendownload "com/google/protobuf" "protobuf-java" "2.3.0"
73SIGNPOSTVER=1.2
74generaldownload "signpost-core-${SIGNPOSTVER}.jar" "http://oauth-signpost.googlecode.com/files"
75generaldownload "signpost-commonshttp4-${SIGNPOSTVER}.jar" "http://oauth-signpost.googlecode.com/files"
76OAUTHVER=20100527
77#OAUTHVER=20090823
78#OAUTHVER=20090617
79generaldownload "oauth-${OAUTHVER}.jar" "http://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth/${OAUTHVER}"
80generaldownload "oauth-consumer-${OAUTHVER}.jar" "http://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-consumer/${OAUTHVER}"
81
82
83echo "Updating local project files for this machine and SDK."
84android update project --path "${PROJECTROOT}"
85
86echo
87trap EXIT
088
=== added directory 'src/com/ubuntuone/android'
=== renamed directory 'src/com/ubuntuone/androidu1' => 'src/com/ubuntuone/android/files'
=== modified file 'src/com/ubuntuone/android/files/AndroidU1.java'
--- src/com/ubuntuone/androidu1/AndroidU1.java 2010-08-12 14:40:01 +0000
+++ src/com/ubuntuone/android/files/AndroidU1.java 2010-10-26 16:39:53 +0000
@@ -18,13 +18,13 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1;21package com.ubuntuone.android.files;
2222
23import android.app.Application;23import android.app.Application;
24import android.util.Config;24import android.util.Config;
25import android.util.Log;25import android.util.Log;
2626
27import com.ubuntuone.androidu1.util.OAuthUtilities;27import com.ubuntuone.android.files.util.OAuthUtilities;
2828
29/**29/**
30 * Single, global application object of the current process.30 * Single, global application object of the current process.
3131
=== modified file 'src/com/ubuntuone/android/files/FilesList.java'
--- src/com/ubuntuone/androidu1/FilesList.java 2010-08-16 00:16:56 +0000
+++ src/com/ubuntuone/android/files/FilesList.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1;21package com.ubuntuone.android.files;
2222
23import java.io.File;23import java.io.File;
24import java.io.IOException;24import java.io.IOException;
@@ -65,18 +65,18 @@
65import android.widget.Toast;65import android.widget.Toast;
66import android.widget.AdapterView.AdapterContextMenuInfo;66import android.widget.AdapterView.AdapterContextMenuInfo;
6767
68import com.ubuntuone.androidu1.net.INetworkListener;68import com.ubuntuone.android.files.net.INetworkListener;
69import com.ubuntuone.androidu1.net.NetworkObserver;69import com.ubuntuone.android.files.net.NetworkObserver;
70import com.ubuntuone.androidu1.provider.U1CloudProviderUtils;70import com.ubuntuone.android.files.provider.U1CloudProviderUtils;
71import com.ubuntuone.androidu1.provider.U1CloudProviderUtils.CloudFiles;71import com.ubuntuone.android.files.provider.U1CloudProviderUtils.CloudFiles;
72import com.ubuntuone.androidu1.service.IU1Service;72import com.ubuntuone.android.files.service.IU1Service;
73import com.ubuntuone.androidu1.service.U1Service;73import com.ubuntuone.android.files.service.U1Service;
74import com.ubuntuone.androidu1.util.BrowserUtilities;74import com.ubuntuone.android.files.util.BrowserUtilities;
75import com.ubuntuone.androidu1.util.ChangeLogUtils;75import com.ubuntuone.android.files.util.ChangeLogUtils;
76import com.ubuntuone.androidu1.util.ConfigUtilities;76import com.ubuntuone.android.files.util.ConfigUtilities;
77import com.ubuntuone.androidu1.util.DialogUtils;77import com.ubuntuone.android.files.util.DialogUtils;
78import com.ubuntuone.androidu1.util.OAuthUtilities;78import com.ubuntuone.android.files.util.OAuthUtilities;
79import com.ubuntuone.androidu1.util.U1HttpUtilities;79import com.ubuntuone.android.files.util.U1HttpUtilities;
8080
81/**81/**
82 * Main application Activity with ~/Ubuntu One files and folders.82 * Main application Activity with ~/Ubuntu One files and folders.
8383
=== modified file 'src/com/ubuntuone/android/files/FilesListCursorAdapter.java'
--- src/com/ubuntuone/androidu1/FilesListCursorAdapter.java 2010-08-15 18:01:00 +0000
+++ src/com/ubuntuone/android/files/FilesListCursorAdapter.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1;21package com.ubuntuone.android.files;
2222
23import android.content.Context;23import android.content.Context;
24import android.database.Cursor;24import android.database.Cursor;
@@ -30,10 +30,10 @@
30import android.widget.ImageView;30import android.widget.ImageView;
31import android.widget.TextView;31import android.widget.TextView;
3232
33import com.ubuntuone.androidu1.provider.U1CloudProviderUtils;33import com.ubuntuone.android.files.provider.U1CloudProviderUtils;
34import com.ubuntuone.androidu1.provider.U1CloudProviderUtils.CloudFiles;34import com.ubuntuone.android.files.provider.U1CloudProviderUtils.CloudFiles;
35import com.ubuntuone.androidu1.util.DateUtilities;35import com.ubuntuone.android.files.util.DateUtilities;
36import com.ubuntuone.androidu1.util.FileUtils;36import com.ubuntuone.android.files.util.FileUtils;
3737
38/**38/**
39 * Custom FilesList Activity cursor adapter.39 * Custom FilesList Activity cursor adapter.
4040
=== modified file 'src/com/ubuntuone/android/files/IAndroidU1.aidl'
--- src/com/ubuntuone/androidu1/IAndroidU1.aidl 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/IAndroidU1.aidl 2010-10-26 16:39:53 +0000
@@ -1,4 +1,4 @@
1package com.ubuntuone.androidu1;1package com.ubuntuone.android.files;
22
3interface IAndroidU1 { 3interface IAndroidU1 {
4 void onGotRoot(in String root);4 void onGotRoot(in String root);
55
=== modified file 'src/com/ubuntuone/android/files/Preferences.java'
--- src/com/ubuntuone/androidu1/Preferences.java 2010-08-15 18:01:00 +0000
+++ src/com/ubuntuone/android/files/Preferences.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1;21package com.ubuntuone.android.files;
2222
23import android.app.AlertDialog;23import android.app.AlertDialog;
24import android.content.Context;24import android.content.Context;
@@ -45,11 +45,11 @@
45import android.util.Log;45import android.util.Log;
46import android.widget.Toast;46import android.widget.Toast;
4747
48import com.ubuntuone.androidu1.provider.U1CloudProviderUtils.CloudFiles;48import com.ubuntuone.android.files.provider.U1CloudProviderUtils.CloudFiles;
49import com.ubuntuone.androidu1.util.BrowserUtilities;49import com.ubuntuone.android.files.util.BrowserUtilities;
50import com.ubuntuone.androidu1.util.ChangeLogUtils;50import com.ubuntuone.android.files.util.ChangeLogUtils;
51import com.ubuntuone.androidu1.util.LogCollector;51import com.ubuntuone.android.files.util.LogCollector;
52import com.ubuntuone.androidu1.util.U1HttpUtilities;52import com.ubuntuone.android.files.util.U1HttpUtilities;
5353
54/**54/**
55 * Application Preferences Activity and preferences utilities.55 * Application Preferences Activity and preferences utilities.
@@ -250,8 +250,8 @@
250 new AlertDialog.Builder(Preferences.this)250 new AlertDialog.Builder(Preferences.this)
251 .setTitle("Are you sure?")251 .setTitle("Are you sure?")
252 .setMessage("If you remove this device, " +252 .setMessage("If you remove this device, " +
253 "your files will not be removed neither locally " +253 "your files will not be removed either locally " +
254 "nor remotely (from Ubuntu One).")254 "or remotely (from Ubuntu One).")
255 .setPositiveButton("Remove", new OnClickListener() {255 .setPositiveButton("Remove", new OnClickListener() {
256 @Override256 @Override
257 public void onClick(DialogInterface dialog, int which) {257 public void onClick(DialogInterface dialog, int which) {
@@ -310,12 +310,8 @@
310 contact.setOnPreferenceClickListener(new OnPreferenceClickListener() {310 contact.setOnPreferenceClickListener(new OnPreferenceClickListener() {
311 @Override311 @Override
312 public boolean onPreferenceClick(Preference preference) {312 public boolean onPreferenceClick(Preference preference) {
313 final Intent emailIntent = new Intent(Intent.ACTION_SEND);313 final Intent askIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://answers.edge.launchpad.net/ubuntuone-android-files/+faqs"));
314 emailIntent.setType("plain/text");314 startActivity(askIntent);
315 emailIntent.putExtra(Intent.EXTRA_EMAIL,
316 new String[] { "mkarnicki@gmail.com" });
317 emailIntent.putExtra(Intent.EXTRA_SUBJECT, "AndroidU1 feedback");
318 startActivity(Intent.createChooser(emailIntent, "Send mail"));
319 return true;315 return true;
320 }316 }
321 });317 });
@@ -422,7 +418,7 @@
422 @Override418 @Override
423 public boolean onPreferenceClick(Preference preference) {419 public boolean onPreferenceClick(Preference preference) {
424 startActivity(new Intent(Intent.ACTION_VIEW,420 startActivity(new Intent(Intent.ACTION_VIEW,
425 Uri.parse("https://launchpad.net/androidu1")));421 Uri.parse("https://launchpad.net/ubuntuone-android-files")));
426 return true;422 return true;
427 }423 }
428 });424 });
429425
=== modified file 'src/com/ubuntuone/android/files/net/INetworkListener.java'
--- src/com/ubuntuone/androidu1/net/INetworkListener.java 2010-08-09 18:56:26 +0000
+++ src/com/ubuntuone/android/files/net/INetworkListener.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.net;21package com.ubuntuone.android.files.net;
2222
23public interface INetworkListener {23public interface INetworkListener {
2424
2525
=== modified file 'src/com/ubuntuone/android/files/net/NetworkObserver.java'
--- src/com/ubuntuone/androidu1/net/NetworkObserver.java 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/net/NetworkObserver.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.net;21package com.ubuntuone.android.files.net;
2222
23import android.app.Service;23import android.app.Service;
24import android.content.BroadcastReceiver;24import android.content.BroadcastReceiver;
@@ -30,7 +30,7 @@
30import android.util.Config;30import android.util.Config;
31import android.util.Log;31import android.util.Log;
3232
33import com.ubuntuone.androidu1.AndroidU1;33import com.ubuntuone.android.files.AndroidU1;
3434
35public class NetworkObserver extends BroadcastReceiver {35public class NetworkObserver extends BroadcastReceiver {
36 36
3737
=== modified file 'src/com/ubuntuone/android/files/provider/U1CloudProvider.java'
--- src/com/ubuntuone/androidu1/provider/U1CloudProvider.java 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/provider/U1CloudProvider.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.provider;21package com.ubuntuone.android.files.provider;
2222
23import java.util.HashMap;23import java.util.HashMap;
2424
@@ -37,9 +37,9 @@
37import android.util.Config;37import android.util.Config;
38import android.util.Log;38import android.util.Log;
3939
40import com.ubuntuone.androidu1.AndroidU1;40import com.ubuntuone.android.files.AndroidU1;
41import com.ubuntuone.androidu1.Preferences;41import com.ubuntuone.android.files.Preferences;
42import com.ubuntuone.androidu1.provider.U1CloudProviderUtils.CloudFiles;42import com.ubuntuone.android.files.provider.U1CloudProviderUtils.CloudFiles;
4343
44/**44/**
45 * AndroidU1 custom content provider serving files and related info.45 * AndroidU1 custom content provider serving files and related info.
@@ -54,7 +54,7 @@
54 private static boolean LOCAL_LOGV = Config.DEBUG || Log.isLoggable(TAG, Log.VERBOSE);54 private static boolean LOCAL_LOGV = Config.DEBUG || Log.isLoggable(TAG, Log.VERBOSE);
55 private static boolean LOCAL_LOGW = Log.isLoggable(TAG, Log.WARN);55 private static boolean LOCAL_LOGW = Log.isLoggable(TAG, Log.WARN);
56 56
57 private static final String DATABASE_NAME = "androidu1.db";57 private static final String DATABASE_NAME = "ubuntone-files.db";
58 private static final int DATABASE_VERSION = 1;58 private static final int DATABASE_VERSION = 1;
59 public static final String TABLE_FILES = "files";59 public static final String TABLE_FILES = "files";
60 60
6161
=== modified file 'src/com/ubuntuone/android/files/provider/U1CloudProviderUtils.java'
--- src/com/ubuntuone/androidu1/provider/U1CloudProviderUtils.java 2010-08-15 18:01:00 +0000
+++ src/com/ubuntuone/android/files/provider/U1CloudProviderUtils.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.provider;21package com.ubuntuone.android.files.provider;
2222
23import android.content.ContentValues;23import android.content.ContentValues;
24import android.content.Context;24import android.content.Context;
@@ -28,7 +28,7 @@
28import android.provider.BaseColumns;28import android.provider.BaseColumns;
29import android.text.TextUtils;29import android.text.TextUtils;
3030
31import com.ubuntuone.androidu1.AndroidU1;31import com.ubuntuone.android.files.AndroidU1;
3232
33/**33/**
34 * U1CloudProvider utilities.34 * U1CloudProvider utilities.
@@ -39,7 +39,7 @@
39 /**39 /**
40 * Unique authority of U1CloudProvider40 * Unique authority of U1CloudProvider
41 */41 */
42 public static final String AUTHORITY = "com.ubuntuone.androidu1.provider.u1cloudprovider";42 public static final String AUTHORITY = "com.ubuntuone.android.files.provider.u1cloudprovider";
43 43
44 public static final String TYPE_DIRECTORY = "DIRECTORY";44 public static final String TYPE_DIRECTORY = "DIRECTORY";
45 45
@@ -58,12 +58,12 @@
58 /**58 /**
59 * The MIME type of {@link #CONTENT_URI} providing a directory of cloud files.59 * The MIME type of {@link #CONTENT_URI} providing a directory of cloud files.
60 */60 */
61 public static final String CONTENT_TYPE = "vnd.androidu1.cursor.dir/vnd.androidu1.cloudfile";61 public static final String CONTENT_TYPE = "vnd.ubuntuonefiles.cursor.dir/vnd.ubuntuonefiles.cloudfile";
6262
63 /**63 /**
64 * The MIME type of a {@link #CONTENT_URI} sub-directory of a single cloud file.64 * The MIME type of a {@link #CONTENT_URI} sub-directory of a single cloud file.
65 */65 */
66 public static final String CONTENT_ITEM_TYPE = "vnd.androidu1.cursor.item/vnd.androidu1.cloudfile";66 public static final String CONTENT_ITEM_TYPE = "vnd.ubuntuonefiles.cursor.item/vnd.ubuntuonefiles.cloudfile";
67 67
68 /**68 /**
69 * Alphabetical order for this table69 * Alphabetical order for this table
7070
=== modified file 'src/com/ubuntuone/android/files/service/IU1Service.aidl'
--- src/com/ubuntuone/androidu1/service/IU1Service.aidl 2010-08-15 18:01:00 +0000
+++ src/com/ubuntuone/android/files/service/IU1Service.aidl 2010-10-26 16:39:53 +0000
@@ -1,6 +1,6 @@
1package com.ubuntuone.androidu1.service;1package com.ubuntuone.android.files.service;
22
3import com.ubuntuone.androidu1.IAndroidU1;3import com.ubuntuone.android.files.IAndroidU1;
44
5interface IU1Service {5interface IU1Service {
66
77
=== modified file 'src/com/ubuntuone/android/files/service/U1Client.java'
--- src/com/ubuntuone/androidu1/service/U1Client.java 2010-08-16 00:16:56 +0000
+++ src/com/ubuntuone/android/files/service/U1Client.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.service;21package com.ubuntuone.android.files.service;
2222
23import java.io.ByteArrayInputStream;23import java.io.ByteArrayInputStream;
24import java.io.ByteArrayOutputStream;24import java.io.ByteArrayOutputStream;
@@ -53,12 +53,12 @@
53import com.twistedmatrix.internet.Deferred;53import com.twistedmatrix.internet.Deferred;
54import com.twistedmatrix.internet.Deferred.Callback;54import com.twistedmatrix.internet.Deferred.Callback;
55import com.twistedmatrix.internet.Deferred.Failure;55import com.twistedmatrix.internet.Deferred.Failure;
56import com.ubuntuone.androidu1.AndroidU1;56import com.ubuntuone.android.files.AndroidU1;
57import com.ubuntuone.androidu1.Preferences;57import com.ubuntuone.android.files.Preferences;
58import com.ubuntuone.androidu1.provider.U1CloudProviderUtils;58import com.ubuntuone.android.files.provider.U1CloudProviderUtils;
59import com.ubuntuone.androidu1.provider.U1CloudProviderUtils.CloudFiles;59import com.ubuntuone.android.files.provider.U1CloudProviderUtils.CloudFiles;
60import com.ubuntuone.androidu1.util.FileUtils;60import com.ubuntuone.android.files.util.FileUtils;
61import com.ubuntuone.androidu1.util.OAuthUtilities;61import com.ubuntuone.android.files.util.OAuthUtilities;
62import com.ubuntuone.storageprotocol.Client;62import com.ubuntuone.storageprotocol.Client;
63import com.ubuntuone.storageprotocol.HashUtils;63import com.ubuntuone.storageprotocol.HashUtils;
64import com.ubuntuone.storageprotocol.IConnector;64import com.ubuntuone.storageprotocol.IConnector;
6565
=== modified file 'src/com/ubuntuone/android/files/service/U1Service.java'
--- src/com/ubuntuone/androidu1/service/U1Service.java 2010-08-16 00:16:56 +0000
+++ src/com/ubuntuone/android/files/service/U1Service.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.service;21package com.ubuntuone.android.files.service;
2222
23import android.app.Notification;23import android.app.Notification;
24import android.app.NotificationManager;24import android.app.NotificationManager;
@@ -34,13 +34,13 @@
34import android.util.Config;34import android.util.Config;
35import android.util.Log;35import android.util.Log;
3636
37import com.ubuntuone.androidu1.AndroidU1;37import com.ubuntuone.android.files.AndroidU1;
38import com.ubuntuone.androidu1.FilesList;38import com.ubuntuone.android.files.FilesList;
39import com.ubuntuone.androidu1.IAndroidU1;39import com.ubuntuone.android.files.IAndroidU1;
40import com.ubuntuone.androidu1.Preferences;40import com.ubuntuone.android.files.Preferences;
41import com.ubuntuone.androidu1.R;41import com.ubuntuone.android.files.R;
42import com.ubuntuone.androidu1.net.INetworkListener;42import com.ubuntuone.android.files.net.INetworkListener;
43import com.ubuntuone.androidu1.net.NetworkObserver;43import com.ubuntuone.android.files.net.NetworkObserver;
44import com.ubuntuone.storageprotocol.IConnector;44import com.ubuntuone.storageprotocol.IConnector;
45import com.ubuntuone.storageprotocol.oio.OIOConnector;45import com.ubuntuone.storageprotocol.oio.OIOConnector;
4646
@@ -63,12 +63,12 @@
63 /**63 /**
64 * Intent action to start the service.64 * Intent action to start the service.
65 */65 */
66 public static final String ACTION_START = "com.ubuntuone.androidu1.service.ACTION_START";66 public static final String ACTION_START = "com.ubuntuone.android.files.service.ACTION_START";
67 67
68 /**68 /**
69 * Intent action to stop the service.69 * Intent action to stop the service.
70 */70 */
71 public static final String ACTION_STOP = "com.ubuntuone.androidu1.service.ACTION_STOP";71 public static final String ACTION_STOP = "com.ubuntuone.android.files.service.ACTION_STOP";
72 72
73 private Notification mNotification;73 private Notification mNotification;
74 74
7575
=== modified file 'src/com/ubuntuone/android/files/sso/SSO.java'
--- src/com/ubuntuone/androidu1/sso/SSO.java 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/sso/SSO.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.sso;21package com.ubuntuone.android.files.sso;
2222
23import android.app.Activity;23import android.app.Activity;
24import android.content.ComponentName;24import android.content.ComponentName;
@@ -31,9 +31,9 @@
31import android.widget.Button;31import android.widget.Button;
32import android.widget.TextView;32import android.widget.TextView;
3333
34import com.ubuntuone.androidu1.AndroidU1;34import com.ubuntuone.android.files.AndroidU1;
35import com.ubuntuone.androidu1.Preferences;35import com.ubuntuone.android.files.Preferences;
36import com.ubuntuone.androidu1.R;36import com.ubuntuone.android.files.R;
3737
38/**38/**
39 * Proof of concept Ubuntu SSO activity, which can share OAuth token with39 * Proof of concept Ubuntu SSO activity, which can share OAuth token with
4040
=== modified file 'src/com/ubuntuone/android/files/util/BrowserUtilities.java'
--- src/com/ubuntuone/androidu1/util/BrowserUtilities.java 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/util/BrowserUtilities.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.util;21package com.ubuntuone.android.files.util;
2222
23import android.content.Context;23import android.content.Context;
24import android.content.Intent;24import android.content.Intent;
2525
=== modified file 'src/com/ubuntuone/android/files/util/ChangeLogUtils.java'
--- src/com/ubuntuone/androidu1/util/ChangeLogUtils.java 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/util/ChangeLogUtils.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.util;21package com.ubuntuone.android.files.util;
2222
23import java.io.BufferedReader;23import java.io.BufferedReader;
24import java.io.IOException;24import java.io.IOException;
@@ -34,9 +34,9 @@
34import android.content.pm.PackageManager.NameNotFoundException;34import android.content.pm.PackageManager.NameNotFoundException;
35import android.text.Html;35import android.text.Html;
3636
37import com.ubuntuone.androidu1.AndroidU1;37import com.ubuntuone.android.files.AndroidU1;
38import com.ubuntuone.androidu1.Preferences;38import com.ubuntuone.android.files.Preferences;
39import com.ubuntuone.androidu1.R;39import com.ubuntuone.android.files.R;
4040
41/**41/**
42 * @author Michał Karnicki <mkarnicki@gmail.com>42 * @author Michał Karnicki <mkarnicki@gmail.com>
4343
=== modified file 'src/com/ubuntuone/android/files/util/ConfigUtilities.java'
--- src/com/ubuntuone/androidu1/util/ConfigUtilities.java 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/util/ConfigUtilities.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.util;21package com.ubuntuone.android.files.util;
2222
23import android.content.Context;23import android.content.Context;
24import android.net.ConnectivityManager;24import android.net.ConnectivityManager;
2525
=== modified file 'src/com/ubuntuone/android/files/util/DateUtilities.java'
--- src/com/ubuntuone/androidu1/util/DateUtilities.java 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/util/DateUtilities.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.util;21package com.ubuntuone.android.files.util;
2222
23/**23/**
24 * Convenience utilities related to dates. 24 * Convenience utilities related to dates.
2525
=== modified file 'src/com/ubuntuone/android/files/util/DialogUtils.java'
--- src/com/ubuntuone/androidu1/util/DialogUtils.java 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/util/DialogUtils.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.util;21package com.ubuntuone.android.files.util;
2222
23import android.app.ProgressDialog;23import android.app.ProgressDialog;
24import android.content.Context;24import android.content.Context;
2525
=== modified file 'src/com/ubuntuone/android/files/util/FileUtils.java'
--- src/com/ubuntuone/androidu1/util/FileUtils.java 2010-08-15 18:01:00 +0000
+++ src/com/ubuntuone/android/files/util/FileUtils.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.util;21package com.ubuntuone.android.files.util;
2222
23import java.io.File;23import java.io.File;
24import java.io.FileNotFoundException;24import java.io.FileNotFoundException;
2525
=== modified file 'src/com/ubuntuone/android/files/util/LogCollector.java'
--- src/com/ubuntuone/androidu1/util/LogCollector.java 2010-08-15 18:01:00 +0000
+++ src/com/ubuntuone/android/files/util/LogCollector.java 2010-10-26 16:39:53 +0000
@@ -1,4 +1,4 @@
1package com.ubuntuone.androidu1.util;1package com.ubuntuone.android.files.util;
22
3import java.util.List;3import java.util.List;
44
@@ -72,7 +72,7 @@
72 String current = "";72 String current = "";
73 final PackageManager pm = ctx.getPackageManager();73 final PackageManager pm = ctx.getPackageManager();
74 try {74 try {
75 PackageInfo pi = pm.getPackageInfo("com.ubuntuone.androidu1", 0);75 PackageInfo pi = pm.getPackageInfo("com.ubuntuone.android.files", 0);
76 current = pi.versionName;76 current = pi.versionName;
77 } catch (NameNotFoundException e) {77 } catch (NameNotFoundException e) {
78 e.printStackTrace();78 e.printStackTrace();
7979
=== modified file 'src/com/ubuntuone/android/files/util/OAuthUtilities.java'
--- src/com/ubuntuone/androidu1/util/OAuthUtilities.java 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/util/OAuthUtilities.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.util;21package com.ubuntuone.android.files.util;
2222
23import java.net.URLEncoder;23import java.net.URLEncoder;
2424
@@ -37,8 +37,8 @@
37import android.util.Config;37import android.util.Config;
38import android.util.Log;38import android.util.Log;
3939
40import com.ubuntuone.androidu1.AndroidU1;40import com.ubuntuone.android.files.AndroidU1;
41import com.ubuntuone.androidu1.Preferences;41import com.ubuntuone.android.files.Preferences;
4242
43/**43/**
44 * OAuth utilities as well as OAuthClient class for easy OAuth management.44 * OAuth utilities as well as OAuthClient class for easy OAuth management.
@@ -70,7 +70,7 @@
70 U1_BASE_URL + "/api/account/";70 U1_BASE_URL + "/api/account/";
71 71
72 // browser callback URI72 // browser callback URI
73 public static final Uri CALLBACK_URI = Uri.parse("x-androidu1://oauth");73 public static final Uri CALLBACK_URI = Uri.parse("x-ubuntuone-files://oauth");
74 74
75 // Ubuntu One OAuth clients should hold that object around75 // Ubuntu One OAuth clients should hold that object around
76 public static class OAuthClient {76 public static class OAuthClient {
7777
=== modified file 'src/com/ubuntuone/android/files/util/U1HttpUtilities.java'
--- src/com/ubuntuone/androidu1/util/U1HttpUtilities.java 2010-08-12 23:20:10 +0000
+++ src/com/ubuntuone/android/files/util/U1HttpUtilities.java 2010-10-26 16:39:53 +0000
@@ -18,7 +18,7 @@
18 * along with this program. If not, see http://www.gnu.org/licenses 18 * along with this program. If not, see http://www.gnu.org/licenses
19 */19 */
2020
21package com.ubuntuone.androidu1.util;21package com.ubuntuone.android.files.util;
2222
23import java.io.ByteArrayOutputStream;23import java.io.ByteArrayOutputStream;
24import java.io.IOException;24import java.io.IOException;
@@ -40,8 +40,8 @@
40import android.util.Config;40import android.util.Config;
41import android.util.Log;41import android.util.Log;
4242
43import com.ubuntuone.androidu1.AndroidU1;43import com.ubuntuone.android.files.AndroidU1;
44import com.ubuntuone.androidu1.Preferences;44import com.ubuntuone.android.files.Preferences;
4545
46/**46/**
47 * Some Ubuntu One http requests utilities. 47 * Some Ubuntu One http requests utilities.

Subscribers

People subscribed via source and target branches