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
1=== modified file '.bzrignore'
2--- .bzrignore 2010-06-14 20:21:54 +0000
3+++ .bzrignore 2010-10-26 16:39:53 +0000
4@@ -1,1 +1,12 @@
5 bin
6+local.properties
7+gen
8+RE:libs/commons-codec-\d.*.jar
9+RE:libs/netty-\d.*.jar
10+RE:libs/oauth-consumer-\d.*.jar
11+RE:libs/oauth-\d.*.jar
12+RE:libs/protobuf-java-\d.*.jar
13+RE:libs/signpost-commonshttp4-\d.*.jar
14+RE:libs/signpost-core-\d.*.jar
15+RE:libs/storageprotocol-\d.*.jar
16+RE:libs/oauth-\d.*.jar
17
18=== modified file 'AndroidManifest.xml'
19--- AndroidManifest.xml 2010-08-16 00:16:56 +0000
20+++ AndroidManifest.xml 2010-10-26 16:39:53 +0000
21@@ -1,7 +1,7 @@
22 <?xml version="1.0" encoding="utf-8"?>
23 <manifest
24 xmlns:android="http://schemas.android.com/apk/res/android"
25- package="com.ubuntuone.androidu1"
26+ package="com.ubuntuone.android.files"
27 android:versionCode="43"
28 android:versionName="0.4.4b" >
29
30@@ -28,14 +28,14 @@
31 android:process=":remote" >
32
33 <intent-filter>
34- <action android:name="com.ubuntuone.androidu1.service.ACTION_START" />
35- <action android:name="com.ubuntuone.androidu1.service.ACTION_STOP" />
36+ <action android:name="com.ubuntuone.android.files.service.ACTION_START" />
37+ <action android:name="com.ubuntuone.android.files.service.ACTION_STOP" />
38 </intent-filter>
39 </service>
40
41 <provider
42 android:name=".provider.U1CloudProvider"
43- android:authorities="com.ubuntuone.androidu1.provider.u1cloudprovider" />
44+ android:authorities="com.ubuntuone.android.files.provider.u1cloudprovider" />
45
46 <activity
47 android:name=".FilesList"
48@@ -44,7 +44,7 @@
49 android:label="@string/fileslist_title" >
50
51 <intent-filter
52- android:label="AndroidU1" >
53+ android:label="@string/app_name" >
54 <action android:name="android.intent.action.MAIN" />
55 <category android:name="android.intent.category.LAUNCHER" />
56 </intent-filter>
57@@ -53,7 +53,7 @@
58 <action android:name="android.intent.action.VIEW" />
59 <category android:name="android.intent.category.DEFAULT" />
60 <category android:name="android.intent.category.BROWSABLE" />
61- <data android:scheme="x-androidu1" />
62+ <data android:scheme="x-ubuntuone-files" />
63 </intent-filter>
64 </activity>
65
66@@ -65,7 +65,7 @@
67 <action android:name="android.intent.action.VIEW" />
68 <category android:name="android.intent.category.DEFAULT" />
69 <category android:name="android.intent.category.BROWSABLE" />
70- <data android:scheme="x-androidu1-sso" />
71+ <data android:scheme="x-ubuntuone-files-sso" />
72 </intent-filter>
73 </activity>
74
75@@ -76,4 +76,4 @@
76 </activity>
77 </application>
78
79-</manifest>
80\ No newline at end of file
81+</manifest>
82
83=== added file 'build.xml'
84--- build.xml 1970-01-01 00:00:00 +0000
85+++ build.xml 2010-10-26 16:39:53 +0000
86@@ -0,0 +1,90 @@
87+<?xml version="1.0" encoding="UTF-8"?>
88+<project name="ubuntu-one-file-sync" default="debug">
89+
90+ <!-- The local.properties file is created and updated by the 'android' tool.
91+ It contains the path to the SDK. It should *NOT* be checked in in Version
92+ Control Systems. -->
93+ <property file="local.properties" />
94+
95+ <!-- The build.properties file can be created by you and is never touched
96+ by the 'android' tool. This is the place to change some of the default property values
97+ used by the Ant rules.
98+ Here are some properties you may want to change/update:
99+
100+ application.package
101+ the name of your application package as defined in the manifest. Used by the
102+ 'uninstall' rule.
103+ source.dir
104+ the name of the source directory. Default is 'src'.
105+ out.dir
106+ the name of the output directory. Default is 'bin'.
107+
108+ Properties related to the SDK location or the project target should be updated
109+ using the 'android' tool with the 'update' action.
110+
111+ This file is an integral part of the build system for your application and
112+ should be checked in in Version Control Systems.
113+
114+ -->
115+ <property file="build.properties" />
116+
117+ <!-- The default.properties file is created and updated by the 'android' tool, as well
118+ as ADT.
119+ This file is an integral part of the build system for your application and
120+ should be checked in in Version Control Systems. -->
121+ <property file="default.properties" />
122+
123+ <!-- Custom Android task to deal with the project target, and import the proper rules.
124+ This requires ant 1.6.0 or above. -->
125+ <path id="android.antlibs">
126+ <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
127+ <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
128+ <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
129+ <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
130+ <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
131+ </path>
132+
133+ <taskdef name="setup"
134+ classname="com.android.ant.SetupTask"
135+ classpathref="android.antlibs" />
136+
137+ <!-- Execute the Android Setup task that will setup some properties specific to the target,
138+ and import the build rules files.
139+
140+ The rules file is imported from
141+ <SDK>/platforms/<target_platform>/templates/android_rules.xml
142+
143+ To customize some build steps for your project:
144+ - copy the content of the main node <project> from android_rules.xml
145+ - paste it in this build.xml below the <setup /> task.
146+ - disable the import by changing the setup task below to <setup import="false" />
147+
148+ This will ensure that the properties are setup correctly but that your customized
149+ build steps are used.
150+ -->
151+ <setup />
152+
153+
154+
155+ <!-- Compiles this project's .java files into .class files. -->
156+ <target name="compile" depends="-resource-src, -aidl"
157+ description="Compiles project's .java files into .class files">
158+ <!-- If android rules are used for a test project, its classpath should include
159+ tested project's location -->
160+ <condition property="extensible.classpath"
161+ value="${tested.project.absolute.dir}/bin/classes" else=".">
162+ <isset property="tested.project.absolute.dir" />
163+ </condition>
164+ <javac encoding="utf-8" target="1.5" debug="true" extdirs=""
165+ destdir="${out.classes.absolute.dir}"
166+ bootclasspathref="android.target.classpath"
167+ verbose="${verbose}" classpath="${extensible.classpath}">
168+ <src path="${source.absolute.dir}" />
169+ <src path="${gen.absolute.dir}" />
170+ <classpath>
171+ <fileset dir="${external.libs.absolute.dir}" includes="*.jar" />
172+ </classpath>
173+ </javac>
174+ </target>
175+
176+</project>
177
178=== removed directory 'gen'
179=== removed directory 'gen/com'
180=== removed directory 'gen/com/ubuntuone'
181=== removed directory 'gen/com/ubuntuone/androidu1'
182=== removed file 'gen/com/ubuntuone/androidu1/IAndroidU1.java'
183--- gen/com/ubuntuone/androidu1/IAndroidU1.java 2010-08-12 23:20:10 +0000
184+++ gen/com/ubuntuone/androidu1/IAndroidU1.java 1970-01-01 00:00:00 +0000
185@@ -1,241 +0,0 @@
186-/*
187- * This file is auto-generated. DO NOT MODIFY.
188- * Original file: /home/mike/src/android/AndroidU1/src/com/ubuntuone/androidu1/IAndroidU1.aidl
189- */
190-package com.ubuntuone.androidu1;
191-public interface IAndroidU1 extends android.os.IInterface
192-{
193-/** Local-side IPC implementation stub class. */
194-public static abstract class Stub extends android.os.Binder implements com.ubuntuone.androidu1.IAndroidU1
195-{
196-private static final java.lang.String DESCRIPTOR = "com.ubuntuone.androidu1.IAndroidU1";
197-/** Construct the stub at attach it to the interface. */
198-public Stub()
199-{
200-this.attachInterface(this, DESCRIPTOR);
201-}
202-/**
203- * Cast an IBinder object into an com.ubuntuone.androidu1.IAndroidU1 interface,
204- * generating a proxy if needed.
205- */
206-public static com.ubuntuone.androidu1.IAndroidU1 asInterface(android.os.IBinder obj)
207-{
208-if ((obj==null)) {
209-return null;
210-}
211-android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
212-if (((iin!=null)&&(iin instanceof com.ubuntuone.androidu1.IAndroidU1))) {
213-return ((com.ubuntuone.androidu1.IAndroidU1)iin);
214-}
215-return new com.ubuntuone.androidu1.IAndroidU1.Stub.Proxy(obj);
216-}
217-public android.os.IBinder asBinder()
218-{
219-return this;
220-}
221-@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
222-{
223-switch (code)
224-{
225-case INTERFACE_TRANSACTION:
226-{
227-reply.writeString(DESCRIPTOR);
228-return true;
229-}
230-case TRANSACTION_onGotRoot:
231-{
232-data.enforceInterface(DESCRIPTOR);
233-java.lang.String _arg0;
234-_arg0 = data.readString();
235-this.onGotRoot(_arg0);
236-reply.writeNoException();
237-return true;
238-}
239-case TRANSACTION_onUpdateDirContentsDone:
240-{
241-data.enforceInterface(DESCRIPTOR);
242-java.lang.String _arg0;
243-_arg0 = data.readString();
244-this.onUpdateDirContentsDone(_arg0);
245-reply.writeNoException();
246-return true;
247-}
248-case TRANSACTION_onFileDownloaded:
249-{
250-data.enforceInterface(DESCRIPTOR);
251-long _arg0;
252-_arg0 = data.readLong();
253-this.onFileDownloaded(_arg0);
254-reply.writeNoException();
255-return true;
256-}
257-case TRANSACTION_onFileUploaded:
258-{
259-data.enforceInterface(DESCRIPTOR);
260-long _arg0;
261-_arg0 = data.readLong();
262-this.onFileUploaded(_arg0);
263-reply.writeNoException();
264-return true;
265-}
266-case TRANSACTION_onServiceIsWorking:
267-{
268-data.enforceInterface(DESCRIPTOR);
269-this.onServiceIsWorking();
270-reply.writeNoException();
271-return true;
272-}
273-case TRANSACTION_onServiceIsIdle:
274-{
275-data.enforceInterface(DESCRIPTOR);
276-this.onServiceIsIdle();
277-reply.writeNoException();
278-return true;
279-}
280-case TRANSACTION_onNotifyState:
281-{
282-data.enforceInterface(DESCRIPTOR);
283-int _arg0;
284-_arg0 = data.readInt();
285-this.onNotifyState(_arg0);
286-reply.writeNoException();
287-return true;
288-}
289-}
290-return super.onTransact(code, data, reply, flags);
291-}
292-private static class Proxy implements com.ubuntuone.androidu1.IAndroidU1
293-{
294-private android.os.IBinder mRemote;
295-Proxy(android.os.IBinder remote)
296-{
297-mRemote = remote;
298-}
299-public android.os.IBinder asBinder()
300-{
301-return mRemote;
302-}
303-public java.lang.String getInterfaceDescriptor()
304-{
305-return DESCRIPTOR;
306-}
307-public void onGotRoot(java.lang.String root) throws android.os.RemoteException
308-{
309-android.os.Parcel _data = android.os.Parcel.obtain();
310-android.os.Parcel _reply = android.os.Parcel.obtain();
311-try {
312-_data.writeInterfaceToken(DESCRIPTOR);
313-_data.writeString(root);
314-mRemote.transact(Stub.TRANSACTION_onGotRoot, _data, _reply, 0);
315-_reply.readException();
316-}
317-finally {
318-_reply.recycle();
319-_data.recycle();
320-}
321-}
322-public void onUpdateDirContentsDone(java.lang.String node) throws android.os.RemoteException
323-{
324-android.os.Parcel _data = android.os.Parcel.obtain();
325-android.os.Parcel _reply = android.os.Parcel.obtain();
326-try {
327-_data.writeInterfaceToken(DESCRIPTOR);
328-_data.writeString(node);
329-mRemote.transact(Stub.TRANSACTION_onUpdateDirContentsDone, _data, _reply, 0);
330-_reply.readException();
331-}
332-finally {
333-_reply.recycle();
334-_data.recycle();
335-}
336-}
337-public void onFileDownloaded(long id) throws android.os.RemoteException
338-{
339-android.os.Parcel _data = android.os.Parcel.obtain();
340-android.os.Parcel _reply = android.os.Parcel.obtain();
341-try {
342-_data.writeInterfaceToken(DESCRIPTOR);
343-_data.writeLong(id);
344-mRemote.transact(Stub.TRANSACTION_onFileDownloaded, _data, _reply, 0);
345-_reply.readException();
346-}
347-finally {
348-_reply.recycle();
349-_data.recycle();
350-}
351-}
352-public void onFileUploaded(long id) throws android.os.RemoteException
353-{
354-android.os.Parcel _data = android.os.Parcel.obtain();
355-android.os.Parcel _reply = android.os.Parcel.obtain();
356-try {
357-_data.writeInterfaceToken(DESCRIPTOR);
358-_data.writeLong(id);
359-mRemote.transact(Stub.TRANSACTION_onFileUploaded, _data, _reply, 0);
360-_reply.readException();
361-}
362-finally {
363-_reply.recycle();
364-_data.recycle();
365-}
366-}
367-public void onServiceIsWorking() throws android.os.RemoteException
368-{
369-android.os.Parcel _data = android.os.Parcel.obtain();
370-android.os.Parcel _reply = android.os.Parcel.obtain();
371-try {
372-_data.writeInterfaceToken(DESCRIPTOR);
373-mRemote.transact(Stub.TRANSACTION_onServiceIsWorking, _data, _reply, 0);
374-_reply.readException();
375-}
376-finally {
377-_reply.recycle();
378-_data.recycle();
379-}
380-}
381-public void onServiceIsIdle() throws android.os.RemoteException
382-{
383-android.os.Parcel _data = android.os.Parcel.obtain();
384-android.os.Parcel _reply = android.os.Parcel.obtain();
385-try {
386-_data.writeInterfaceToken(DESCRIPTOR);
387-mRemote.transact(Stub.TRANSACTION_onServiceIsIdle, _data, _reply, 0);
388-_reply.readException();
389-}
390-finally {
391-_reply.recycle();
392-_data.recycle();
393-}
394-}
395-public void onNotifyState(int state) throws android.os.RemoteException
396-{
397-android.os.Parcel _data = android.os.Parcel.obtain();
398-android.os.Parcel _reply = android.os.Parcel.obtain();
399-try {
400-_data.writeInterfaceToken(DESCRIPTOR);
401-_data.writeInt(state);
402-mRemote.transact(Stub.TRANSACTION_onNotifyState, _data, _reply, 0);
403-_reply.readException();
404-}
405-finally {
406-_reply.recycle();
407-_data.recycle();
408-}
409-}
410-}
411-static final int TRANSACTION_onGotRoot = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
412-static final int TRANSACTION_onUpdateDirContentsDone = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
413-static final int TRANSACTION_onFileDownloaded = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
414-static final int TRANSACTION_onFileUploaded = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
415-static final int TRANSACTION_onServiceIsWorking = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
416-static final int TRANSACTION_onServiceIsIdle = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
417-static final int TRANSACTION_onNotifyState = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
418-}
419-public void onGotRoot(java.lang.String root) throws android.os.RemoteException;
420-public void onUpdateDirContentsDone(java.lang.String node) throws android.os.RemoteException;
421-public void onFileDownloaded(long id) throws android.os.RemoteException;
422-public void onFileUploaded(long id) throws android.os.RemoteException;
423-public void onServiceIsWorking() throws android.os.RemoteException;
424-public void onServiceIsIdle() throws android.os.RemoteException;
425-public void onNotifyState(int state) throws android.os.RemoteException;
426-}
427
428=== removed file 'gen/com/ubuntuone/androidu1/R.java'
429--- gen/com/ubuntuone/androidu1/R.java 2010-08-15 18:01:00 +0000
430+++ gen/com/ubuntuone/androidu1/R.java 1970-01-01 00:00:00 +0000
431@@ -1,204 +0,0 @@
432-/* AUTO-GENERATED FILE. DO NOT MODIFY.
433- *
434- * This class was automatically generated by the
435- * aapt tool from the resource data it found. It
436- * should not be modified by hand.
437- */
438-
439-package com.ubuntuone.androidu1;
440-
441-public final class R {
442- public static final class anim {
443- public static final int files_list_row_animation=0x7f040000;
444- public static final int item_ready_animation=0x7f040001;
445- }
446- public static final class attr {
447- }
448- public static final class drawable {
449- public static final int android_icon=0x7f020000;
450- public static final int file=0x7f020001;
451- public static final int folder=0x7f020002;
452- public static final int ic_menu_refresh=0x7f020003;
453- public static final int launcher=0x7f020004;
454- public static final int list_selector=0x7f020005;
455- public static final int mime_image=0x7f020006;
456- public static final int mime_music=0x7f020007;
457- public static final int mime_pdf=0x7f020008;
458- public static final int mime_video=0x7f020009;
459- public static final int star=0x7f02000a;
460- }
461- public static final class id {
462- public static final int changelog_scroll=0x7f090000;
463- public static final int changelog_text=0x7f090001;
464- public static final int download_file=0x7f09000f;
465- public static final int filename=0x7f090007;
466- public static final int icon=0x7f090005;
467- public static final int lastsync=0x7f090008;
468- public static final int loginButton=0x7f090003;
469- public static final int loginDescription=0x7f090004;
470- public static final int loginImage=0x7f090002;
471- public static final int online_group=0x7f090010;
472- public static final int open_directory=0x7f09001b;
473- public static final int open_file=0x7f09000e;
474- public static final int option_exit=0x7f09001a;
475- public static final int option_help=0x7f090018;
476- public static final int option_preferences=0x7f090019;
477- public static final int option_refresh=0x7f090011;
478- public static final int option_search=0x7f090017;
479- public static final int option_upload=0x7f090012;
480- public static final int option_upload_any=0x7f090016;
481- public static final int option_upload_audio=0x7f090015;
482- public static final int option_upload_image=0x7f090013;
483- public static final int option_upload_video=0x7f090014;
484- public static final int size=0x7f090009;
485- public static final int ssoAcceptButton=0x7f09000d;
486- public static final int ssoClient=0x7f09000a;
487- public static final int ssoDescription=0x7f09000b;
488- public static final int ssoRejectButton=0x7f09000c;
489- public static final int star=0x7f090006;
490- }
491- public static final class layout {
492- public static final int changelog=0x7f030000;
493- public static final int login=0x7f030001;
494- public static final int main=0x7f030002;
495- public static final int row=0x7f030003;
496- public static final int sso=0x7f030004;
497- }
498- public static final class menu {
499- public static final int file_context_menu=0x7f080000;
500- public static final int files_list_options_menu=0x7f080001;
501- public static final int folder_context_menu=0x7f080002;
502- }
503- public static final class raw {
504- public static final int changelog=0x7f060000;
505- public static final int help=0x7f060001;
506- public static final int intro=0x7f060002;
507- }
508- public static final class string {
509- public static final int about=0x7f07004e;
510- public static final int about_service=0x7f070007;
511- public static final int about_summary=0x7f07004f;
512- public static final int ack=0x7f070053;
513- public static final int app_desc=0x7f070001;
514- public static final int app_name=0x7f070000;
515- /** Application
516- */
517- public static final int application=0x7f070045;
518- public static final int background_service=0x7f070039;
519- public static final int background_service_summary_off=0x7f07003b;
520- public static final int background_service_summary_on=0x7f07003a;
521- public static final int change_after_restart=0x7f070058;
522- public static final int contact_developer=0x7f070049;
523- public static final int contact_developer_summary=0x7f07004a;
524- public static final int context_delete_text=0x7f07001b;
525- public static final int context_download_text=0x7f070018;
526- /** context menu
527- */
528- public static final int context_open_text=0x7f070017;
529- public static final int context_rename_text=0x7f07001a;
530- public static final int context_sync_text=0x7f070019;
531- /** About::Development
532- */
533- public static final int development=0x7f070050;
534- public static final int email=0x7f070030;
535- public static final int fetch_token_failed=0x7f070003;
536- /** files list
537- feching_data ~ getting files and folders list
538- */
539- public static final int fetching_data=0x7f070015;
540- public static final int file_is_downloading=0x7f07000b;
541- public static final int fileslist_title=0x7f070002;
542- public static final int help=0x7f070047;
543- public static final int help_summary=0x7f070048;
544- /** Other
545- */
546- public static final int hint=0x7f070057;
547- public static final int keep_service_default=0x7f07005b;
548- public static final int license_summary=0x7f070051;
549- public static final int list_sort=0x7f070033;
550- public static final int login_adding_device=0x7f070014;
551- /** login screen
552- */
553- public static final int login_button_text=0x7f070012;
554- public static final int login_desc_text=0x7f070013;
555- /** Manage
556- */
557- public static final int manage_account=0x7f07003c;
558- public static final int manage_online=0x7f070041;
559- public static final int manage_online_summary=0x7f070042;
560- public static final int more_info=0x7f070055;
561- public static final int no_connection_available=0x7f070004;
562- /** no_data ~ no files and no folders
563- */
564- public static final int no_data=0x7f070016;
565- public static final int no_file_selected=0x7f07000d;
566- public static final int no_suitable_connection_available=0x7f070005;
567- public static final int not_yet_available=0x7f07000a;
568- public static final int option_exit_text=0x7f070025;
569- public static final int option_exit_text_short=0x7f070026;
570- public static final int option_help_text=0x7f070023;
571- /** options menu
572- */
573- public static final int option_refresh_text=0x7f07001c;
574- public static final int option_search_text=0x7f070022;
575- public static final int option_settings_text=0x7f070024;
576- public static final int option_upload_any_text=0x7f070021;
577- public static final int option_upload_audio_text=0x7f070020;
578- public static final int option_upload_image_text=0x7f07001e;
579- public static final int option_upload_text=0x7f07001d;
580- public static final int option_upload_video_text=0x7f07001f;
581- /** Options
582- */
583- public static final int options=0x7f070032;
584- public static final int pick_audio_with=0x7f070011;
585- /** upload picker
586- */
587- public static final int pick_image_with=0x7f07000f;
588- public static final int pick_video_with=0x7f070010;
589- public static final int plan=0x7f070031;
590- public static final int preferences_title=0x7f07002b;
591- public static final int refreshing=0x7f07000c;
592- public static final int reg_with_service_failed=0x7f070008;
593- public static final int remove_device=0x7f07003d;
594- public static final int remove_device_summary=0x7f07003e;
595- public static final int remove_missing=0x7f070036;
596- public static final int remove_missing_default=0x7f07005a;
597- public static final int remove_missing_summary_off=0x7f070038;
598- public static final int remove_missing_summary_on=0x7f070037;
599- public static final int send_logs=0x7f07004b;
600- public static final int send_logs_summary=0x7f07004c;
601- /** when the service has disconnected without known reason
602- */
603- public static final int service_lost=0x7f070009;
604- public static final int service_not_connected=0x7f070006;
605- public static final int service_notification=0x7f07005c;
606- /** Default values
607- */
608- public static final int sort=0x7f070059;
609- public static final int sort_alphabetical_label=0x7f070034;
610- public static final int sort_folders_first_label=0x7f070035;
611- public static final int support_options=0x7f070043;
612- public static final int support_options_summary=0x7f070044;
613- public static final int tag_animated=0x7f07002a;
614- public static final int tag_filename=0x7f070028;
615- public static final int tag_status=0x7f070029;
616- public static final int tag_type=0x7f070027;
617- public static final int tap_for_changelog=0x7f070046;
618- public static final int tap_to_refresh=0x7f07002e;
619- public static final int thanks=0x7f070054;
620- public static final int translation=0x7f070052;
621- /** Ubuntu One Account
622- */
623- public static final int ubuntu_one_account=0x7f07002c;
624- public static final int unknown_value=0x7f07002d;
625- public static final int upgrade_subscription=0x7f07003f;
626- public static final int upgrade_subscription_summary=0x7f070040;
627- public static final int uploading=0x7f07000e;
628- public static final int username=0x7f07002f;
629- public static final int version=0x7f07004d;
630- public static final int webpage=0x7f070056;
631- }
632- public static final class xml {
633- public static final int preferences=0x7f050000;
634- }
635-}
636
637=== removed directory 'gen/com/ubuntuone/androidu1/service'
638=== removed file 'gen/com/ubuntuone/androidu1/service/IU1Service.java'
639--- gen/com/ubuntuone/androidu1/service/IU1Service.java 2010-08-15 18:01:00 +0000
640+++ gen/com/ubuntuone/androidu1/service/IU1Service.java 1970-01-01 00:00:00 +0000
641@@ -1,262 +0,0 @@
642-/*
643- * This file is auto-generated. DO NOT MODIFY.
644- * Original file: /home/mike/src/android/AndroidU1/src/com/ubuntuone/androidu1/service/IU1Service.aidl
645- */
646-package com.ubuntuone.androidu1.service;
647-public interface IU1Service extends android.os.IInterface
648-{
649-/** Local-side IPC implementation stub class. */
650-public static abstract class Stub extends android.os.Binder implements com.ubuntuone.androidu1.service.IU1Service
651-{
652-private static final java.lang.String DESCRIPTOR = "com.ubuntuone.androidu1.service.IU1Service";
653-/** Construct the stub at attach it to the interface. */
654-public Stub()
655-{
656-this.attachInterface(this, DESCRIPTOR);
657-}
658-/**
659- * Cast an IBinder object into an com.ubuntuone.androidu1.service.IU1Service interface,
660- * generating a proxy if needed.
661- */
662-public static com.ubuntuone.androidu1.service.IU1Service asInterface(android.os.IBinder obj)
663-{
664-if ((obj==null)) {
665-return null;
666-}
667-android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
668-if (((iin!=null)&&(iin instanceof com.ubuntuone.androidu1.service.IU1Service))) {
669-return ((com.ubuntuone.androidu1.service.IU1Service)iin);
670-}
671-return new com.ubuntuone.androidu1.service.IU1Service.Stub.Proxy(obj);
672-}
673-public android.os.IBinder asBinder()
674-{
675-return this;
676-}
677-@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
678-{
679-switch (code)
680-{
681-case INTERFACE_TRANSACTION:
682-{
683-reply.writeString(DESCRIPTOR);
684-return true;
685-}
686-case TRANSACTION_registerCallback:
687-{
688-data.enforceInterface(DESCRIPTOR);
689-com.ubuntuone.androidu1.IAndroidU1 _arg0;
690-_arg0 = com.ubuntuone.androidu1.IAndroidU1.Stub.asInterface(data.readStrongBinder());
691-this.registerCallback(_arg0);
692-reply.writeNoException();
693-return true;
694-}
695-case TRANSACTION_unregisterCallback:
696-{
697-data.enforceInterface(DESCRIPTOR);
698-com.ubuntuone.androidu1.IAndroidU1 _arg0;
699-_arg0 = com.ubuntuone.androidu1.IAndroidU1.Stub.asInterface(data.readStrongBinder());
700-this.unregisterCallback(_arg0);
701-reply.writeNoException();
702-return true;
703-}
704-case TRANSACTION_isConnected:
705-{
706-data.enforceInterface(DESCRIPTOR);
707-boolean _result = this.isConnected();
708-reply.writeNoException();
709-reply.writeInt(((_result)?(1):(0)));
710-return true;
711-}
712-case TRANSACTION_setNetworkType:
713-{
714-data.enforceInterface(DESCRIPTOR);
715-int _arg0;
716-_arg0 = data.readInt();
717-this.setNetworkType(_arg0);
718-reply.writeNoException();
719-return true;
720-}
721-case TRANSACTION_updateDirContents:
722-{
723-data.enforceInterface(DESCRIPTOR);
724-java.lang.String _arg0;
725-_arg0 = data.readString();
726-this.updateDirContents(_arg0);
727-reply.writeNoException();
728-return true;
729-}
730-case TRANSACTION_downloadFile:
731-{
732-data.enforceInterface(DESCRIPTOR);
733-long _arg0;
734-_arg0 = data.readLong();
735-this.downloadFile(_arg0);
736-reply.writeNoException();
737-return true;
738-}
739-case TRANSACTION_uploadFile:
740-{
741-data.enforceInterface(DESCRIPTOR);
742-android.net.Uri _arg0;
743-if ((0!=data.readInt())) {
744-_arg0 = android.net.Uri.CREATOR.createFromParcel(data);
745-}
746-else {
747-_arg0 = null;
748-}
749-java.lang.String _arg1;
750-_arg1 = data.readString();
751-this.uploadFile(_arg0, _arg1);
752-reply.writeNoException();
753-return true;
754-}
755-}
756-return super.onTransact(code, data, reply, flags);
757-}
758-private static class Proxy implements com.ubuntuone.androidu1.service.IU1Service
759-{
760-private android.os.IBinder mRemote;
761-Proxy(android.os.IBinder remote)
762-{
763-mRemote = remote;
764-}
765-public android.os.IBinder asBinder()
766-{
767-return mRemote;
768-}
769-public java.lang.String getInterfaceDescriptor()
770-{
771-return DESCRIPTOR;
772-}
773-public void registerCallback(com.ubuntuone.androidu1.IAndroidU1 au1) throws android.os.RemoteException
774-{
775-android.os.Parcel _data = android.os.Parcel.obtain();
776-android.os.Parcel _reply = android.os.Parcel.obtain();
777-try {
778-_data.writeInterfaceToken(DESCRIPTOR);
779-_data.writeStrongBinder((((au1!=null))?(au1.asBinder()):(null)));
780-mRemote.transact(Stub.TRANSACTION_registerCallback, _data, _reply, 0);
781-_reply.readException();
782-}
783-finally {
784-_reply.recycle();
785-_data.recycle();
786-}
787-}
788-public void unregisterCallback(com.ubuntuone.androidu1.IAndroidU1 au1) throws android.os.RemoteException
789-{
790-android.os.Parcel _data = android.os.Parcel.obtain();
791-android.os.Parcel _reply = android.os.Parcel.obtain();
792-try {
793-_data.writeInterfaceToken(DESCRIPTOR);
794-_data.writeStrongBinder((((au1!=null))?(au1.asBinder()):(null)));
795-mRemote.transact(Stub.TRANSACTION_unregisterCallback, _data, _reply, 0);
796-_reply.readException();
797-}
798-finally {
799-_reply.recycle();
800-_data.recycle();
801-}
802-}
803-public boolean isConnected() throws android.os.RemoteException
804-{
805-android.os.Parcel _data = android.os.Parcel.obtain();
806-android.os.Parcel _reply = android.os.Parcel.obtain();
807-boolean _result;
808-try {
809-_data.writeInterfaceToken(DESCRIPTOR);
810-mRemote.transact(Stub.TRANSACTION_isConnected, _data, _reply, 0);
811-_reply.readException();
812-_result = (0!=_reply.readInt());
813-}
814-finally {
815-_reply.recycle();
816-_data.recycle();
817-}
818-return _result;
819-}
820-public void setNetworkType(int type) throws android.os.RemoteException
821-{
822-android.os.Parcel _data = android.os.Parcel.obtain();
823-android.os.Parcel _reply = android.os.Parcel.obtain();
824-try {
825-_data.writeInterfaceToken(DESCRIPTOR);
826-_data.writeInt(type);
827-mRemote.transact(Stub.TRANSACTION_setNetworkType, _data, _reply, 0);
828-_reply.readException();
829-}
830-finally {
831-_reply.recycle();
832-_data.recycle();
833-}
834-}
835-public void updateDirContents(java.lang.String node) throws android.os.RemoteException
836-{
837-android.os.Parcel _data = android.os.Parcel.obtain();
838-android.os.Parcel _reply = android.os.Parcel.obtain();
839-try {
840-_data.writeInterfaceToken(DESCRIPTOR);
841-_data.writeString(node);
842-mRemote.transact(Stub.TRANSACTION_updateDirContents, _data, _reply, 0);
843-_reply.readException();
844-}
845-finally {
846-_reply.recycle();
847-_data.recycle();
848-}
849-}
850-public void downloadFile(long id) throws android.os.RemoteException
851-{
852-android.os.Parcel _data = android.os.Parcel.obtain();
853-android.os.Parcel _reply = android.os.Parcel.obtain();
854-try {
855-_data.writeInterfaceToken(DESCRIPTOR);
856-_data.writeLong(id);
857-mRemote.transact(Stub.TRANSACTION_downloadFile, _data, _reply, 0);
858-_reply.readException();
859-}
860-finally {
861-_reply.recycle();
862-_data.recycle();
863-}
864-}
865-public void uploadFile(android.net.Uri uri, java.lang.String path) throws android.os.RemoteException
866-{
867-android.os.Parcel _data = android.os.Parcel.obtain();
868-android.os.Parcel _reply = android.os.Parcel.obtain();
869-try {
870-_data.writeInterfaceToken(DESCRIPTOR);
871-if ((uri!=null)) {
872-_data.writeInt(1);
873-uri.writeToParcel(_data, 0);
874-}
875-else {
876-_data.writeInt(0);
877-}
878-_data.writeString(path);
879-mRemote.transact(Stub.TRANSACTION_uploadFile, _data, _reply, 0);
880-_reply.readException();
881-}
882-finally {
883-_reply.recycle();
884-_data.recycle();
885-}
886-}
887-}
888-static final int TRANSACTION_registerCallback = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
889-static final int TRANSACTION_unregisterCallback = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
890-static final int TRANSACTION_isConnected = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
891-static final int TRANSACTION_setNetworkType = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
892-static final int TRANSACTION_updateDirContents = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
893-static final int TRANSACTION_downloadFile = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
894-static final int TRANSACTION_uploadFile = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
895-}
896-public void registerCallback(com.ubuntuone.androidu1.IAndroidU1 au1) throws android.os.RemoteException;
897-public void unregisterCallback(com.ubuntuone.androidu1.IAndroidU1 au1) throws android.os.RemoteException;
898-public boolean isConnected() throws android.os.RemoteException;
899-public void setNetworkType(int type) throws android.os.RemoteException;
900-public void updateDirContents(java.lang.String node) throws android.os.RemoteException;
901-public void downloadFile(long id) throws android.os.RemoteException;
902-public void uploadFile(android.net.Uri uri, java.lang.String path) throws android.os.RemoteException;
903-}
904
905=== removed file 'lib/commons-codec-1.3.jar'
906Binary 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
907=== removed file 'lib/json_simple-1.0.2.jar'
908Binary 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
909=== removed file 'lib/signpost-commonshttp4-1.2.jar'
910Binary 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
911=== removed file 'lib/signpost-core-1.2.jar'
912Binary 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
913=== renamed directory 'lib' => 'libs'
914=== modified file 'res/raw/help'
915--- res/raw/help 2010-08-15 18:01:00 +0000
916+++ res/raw/help 2010-10-26 16:39:53 +0000
917@@ -1,4 +1,4 @@
918-<small><b>Basics of AndroidU1</b>
919+<small><b>Basics of Ubuntu One File Sync</b>
920
921 <u>Browse</u>
922
923@@ -15,18 +15,18 @@
924
925 <b>Support</b>
926
927-<u>AndroidU1 support</u>
928+<u>Ubuntu One File Sync support</u>
929
930-For AndroidU1 related support, visit the project page at <i>http://wiki.ubuntu.com/AndroidU1</i> or jump into <i>irc.freenode.net #androidu1</i>
931+For 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>
932
933 <u>Ubuntu One support</u>
934
935-For Ubuntu One related support, visit <i>Menu > Settings > Ubuntu One Support</i>.
936+For Ubuntu One related support, visit <i>Menu &gt; Settings &gt; Ubuntu One Support</i>.
937
938
939 <b>About the service</b>
940
941-AndroidU1 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.
942+Ubuntu 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.
943
944
945 <b>Troubleshooting</b>
946@@ -36,9 +36,9 @@
947
948 <b>Final words</b>
949
950-I hope you'll enjoy using AndroidU1. It's still under development and there are many great features to come!
951+I hope you'll enjoy using Ubuntu One File Sync. It's still under development and there are many great features to come!
952
953-You can mail me from <i>Menu > Settings > About</i> or join us to share comments and ideas on <i>irc.freenode.net #androidu1</i>.
954+You 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>.
955
956 Project page:
957-http://wiki.ubuntu.com/AndroidU1</small>
958\ No newline at end of file
959+http://wiki.ubuntu.com/AndroidU1</small>
960
961=== modified file 'res/raw/intro'
962--- res/raw/intro 2010-08-15 18:01:00 +0000
963+++ res/raw/intro 2010-10-26 16:39:53 +0000
964@@ -1,24 +1,27 @@
965-<small>Thanks for installing <b>AndroidU1</b>!
966+<small>Thanks for installing
967+<b>Ubuntu One File Sync</b>!
968
969 <u>Please read this carefully.</u>
970
971-<b>AndroidU1</b> gives you access
972-to <b>Ubuntu One</b> cloud storage.
973+<b>Ubuntu One File Sync</b> gives
974+you access to <b>Ubuntu One</b>
975+cloud storage.
976
977 Since Ubuntu One is all about
978 synchronization (that feature is
979-work in progress), AndroidU1 is
980-supported by a background service.
981+work in progress), Ubuntu One
982+File sync is supported by a
983+background service.
984
985-It's job is to complete your
986+Its job is to complete your
987 file transfers and perform
988-any necessary sync (WIP).
989+any necessary sync.
990 If you do not want to leave that
991 service in background, make sure
992 to shut it down by closing
993-application with <i>Menu > Stop sync</i>.
994+application with <i>Menu &gt; Stop sync</i>.
995
996 Enjoy!
997
998 For more details, visit
999-<i>Menu > Help</i></small>
1000\ No newline at end of file
1001+<i>Menu &gt; Help</i></small>
1002
1003=== modified file 'res/values/application.xml'
1004--- res/values/application.xml 2010-08-06 14:57:16 +0000
1005+++ res/values/application.xml 2010-10-26 16:39:53 +0000
1006@@ -1,5 +1,5 @@
1007 <?xml version="1.0" encoding="utf-8"?>
1008 <resources>
1009- <string name="app_name">AndroidU1</string>
1010+ <string name="app_name">Ubuntu One File Sync</string>
1011 <string name="app_desc">Access Ubuntu One storage, share files and folders, sync.</string>
1012 </resources>
1013
1014=== modified file 'res/values/preferences.xml'
1015--- res/values/preferences.xml 2010-08-15 18:01:00 +0000
1016+++ res/values/preferences.xml 2010-10-26 16:39:53 +0000
1017@@ -51,15 +51,15 @@
1018 <string name="help">Help</string>
1019 <string name="help_summary">Instructions, FAQ, etc.</string>
1020
1021- <string name="contact_developer">Contact developer</string>
1022- <string name="contact_developer_summary">Your feedback is most welcome.</string>
1023+ <string name="contact_developer">Ask questions</string>
1024+ <string name="contact_developer_summary">Questions and feedback are welcome.</string>
1025
1026 <string name="send_logs">Send logs</string>
1027- <string name="send_logs_summary">Problems? Share your logs with me.</string>
1028+ <string name="send_logs_summary">Problems? Share your logs with developers.</string>
1029
1030 <string name="version">Version</string>
1031
1032- <string name="about">About AndroidU1</string>
1033+ <string name="about">About Ubuntu One File Sync</string>
1034 <string name="about_summary"></string>
1035
1036 <!-- About::Development -->
1037
1038=== modified file 'res/xml/preferences.xml'
1039--- res/xml/preferences.xml 2010-08-15 18:01:00 +0000
1040+++ res/xml/preferences.xml 2010-10-26 16:39:53 +0000
1041@@ -59,7 +59,7 @@
1042 <Preference android:key="community" android:title="Ubuntu Community" android:summary="Thank you for all support!" android:selectable="false"></Preference>
1043 </PreferenceCategory>
1044
1045-<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>
1046+<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>
1047 </PreferenceCategory>
1048 </PreferenceScreen>
1049
1050
1051=== added file 'setup'
1052--- setup 1970-01-01 00:00:00 +0000
1053+++ setup 2010-10-26 16:39:53 +0000
1054@@ -0,0 +1,87 @@
1055+#!/bin/sh
1056+
1057+## TODO: One day, move all this into the build.xml file. The file tests are ripe for use by ant.
1058+
1059+if test "$1" = "cleanlib"; then
1060+ rm libs/*
1061+ bzr revert libs/
1062+fi
1063+
1064+PROJECTROOT=$(bzr root || pwd)
1065+
1066+ANDROIDBIN=$(which android)
1067+if test -z "${DOWNLOADER}"; then which wget >/dev/null && DOWNLOADER="$(which wget) --no-verbose -O "; fi
1068+if test -z "${DOWNLOADER}"; then which curl >/dev/null && DOWNLOADER="$(which curl) -o "; fi
1069+
1070+if test -z "${ANDROIDBIN}"; then
1071+ echo "Android SDK tools not in PATH." >&2
1072+ echo " PATH=\$PATH:/PathToSDK/tools" >&2
1073+ return 1
1074+fi
1075+
1076+if test -z "${DOWNLOADER}"; then
1077+ echo "Need wget or curl to download." >&2
1078+ return 1
1079+fi
1080+
1081+trap "echo ' ==== Not Successful. ===='" EXIT
1082+set -e
1083+
1084+echo "Downloading dependencies."
1085+cd "${PROJECTROOT}"/libs
1086+
1087+generaldownload() {
1088+ local filename=$1
1089+ local urlstart=$2
1090+ echo " - ${filename}"
1091+ if test -f "${filename}" && file "${filename}" |grep -i "zip archive" >/dev/null; then
1092+ :
1093+ else
1094+ rm -f "${filename}"
1095+ ${DOWNLOADER} "${filename}" "${urlstart}/${filename}"
1096+ fi
1097+ file "${filename}" |grep -i "zip archive" >/dev/null
1098+ return $?
1099+}
1100+
1101+mavendownload() {
1102+ local groupid=$1
1103+ local artifactid=$2
1104+ local vers=$3
1105+ generaldownload \
1106+ "${artifactid}-${vers}.jar" \
1107+ "http://mirrors.ibiblio.org/pub/mirrors/maven2/${groupid}/${artifactid}/${vers}"
1108+ return $?
1109+}
1110+
1111+
1112+nexusdownload() {
1113+ local groupid=$1
1114+ local artifactid=$2
1115+ local vers=$3
1116+ generaldownload \
1117+ "${artifactid}-${vers}.jar" \
1118+ "http://repository.jboss.org/nexus/content/groups/public-jboss/${groupid}/${artifactid}/${vers}"
1119+ return $?
1120+}
1121+
1122+# If you add new downloadable jar files here, please add a wildcard to
1123+# ".bzrignore" to match it in libs/ , and "bzr remove" the existing file if
1124+# it's in the branch.
1125+nexusdownload "org/jboss/netty" "netty" "3.1.5.GA"
1126+mavendownload "com/google/protobuf" "protobuf-java" "2.3.0"
1127+SIGNPOSTVER=1.2
1128+generaldownload "signpost-core-${SIGNPOSTVER}.jar" "http://oauth-signpost.googlecode.com/files"
1129+generaldownload "signpost-commonshttp4-${SIGNPOSTVER}.jar" "http://oauth-signpost.googlecode.com/files"
1130+OAUTHVER=20100527
1131+#OAUTHVER=20090823
1132+#OAUTHVER=20090617
1133+generaldownload "oauth-${OAUTHVER}.jar" "http://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth/${OAUTHVER}"
1134+generaldownload "oauth-consumer-${OAUTHVER}.jar" "http://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-consumer/${OAUTHVER}"
1135+
1136+
1137+echo "Updating local project files for this machine and SDK."
1138+android update project --path "${PROJECTROOT}"
1139+
1140+echo
1141+trap EXIT
1142
1143=== added directory 'src/com/ubuntuone/android'
1144=== renamed directory 'src/com/ubuntuone/androidu1' => 'src/com/ubuntuone/android/files'
1145=== modified file 'src/com/ubuntuone/android/files/AndroidU1.java'
1146--- src/com/ubuntuone/androidu1/AndroidU1.java 2010-08-12 14:40:01 +0000
1147+++ src/com/ubuntuone/android/files/AndroidU1.java 2010-10-26 16:39:53 +0000
1148@@ -18,13 +18,13 @@
1149 * along with this program. If not, see http://www.gnu.org/licenses
1150 */
1151
1152-package com.ubuntuone.androidu1;
1153+package com.ubuntuone.android.files;
1154
1155 import android.app.Application;
1156 import android.util.Config;
1157 import android.util.Log;
1158
1159-import com.ubuntuone.androidu1.util.OAuthUtilities;
1160+import com.ubuntuone.android.files.util.OAuthUtilities;
1161
1162 /**
1163 * Single, global application object of the current process.
1164
1165=== modified file 'src/com/ubuntuone/android/files/FilesList.java'
1166--- src/com/ubuntuone/androidu1/FilesList.java 2010-08-16 00:16:56 +0000
1167+++ src/com/ubuntuone/android/files/FilesList.java 2010-10-26 16:39:53 +0000
1168@@ -18,7 +18,7 @@
1169 * along with this program. If not, see http://www.gnu.org/licenses
1170 */
1171
1172-package com.ubuntuone.androidu1;
1173+package com.ubuntuone.android.files;
1174
1175 import java.io.File;
1176 import java.io.IOException;
1177@@ -65,18 +65,18 @@
1178 import android.widget.Toast;
1179 import android.widget.AdapterView.AdapterContextMenuInfo;
1180
1181-import com.ubuntuone.androidu1.net.INetworkListener;
1182-import com.ubuntuone.androidu1.net.NetworkObserver;
1183-import com.ubuntuone.androidu1.provider.U1CloudProviderUtils;
1184-import com.ubuntuone.androidu1.provider.U1CloudProviderUtils.CloudFiles;
1185-import com.ubuntuone.androidu1.service.IU1Service;
1186-import com.ubuntuone.androidu1.service.U1Service;
1187-import com.ubuntuone.androidu1.util.BrowserUtilities;
1188-import com.ubuntuone.androidu1.util.ChangeLogUtils;
1189-import com.ubuntuone.androidu1.util.ConfigUtilities;
1190-import com.ubuntuone.androidu1.util.DialogUtils;
1191-import com.ubuntuone.androidu1.util.OAuthUtilities;
1192-import com.ubuntuone.androidu1.util.U1HttpUtilities;
1193+import com.ubuntuone.android.files.net.INetworkListener;
1194+import com.ubuntuone.android.files.net.NetworkObserver;
1195+import com.ubuntuone.android.files.provider.U1CloudProviderUtils;
1196+import com.ubuntuone.android.files.provider.U1CloudProviderUtils.CloudFiles;
1197+import com.ubuntuone.android.files.service.IU1Service;
1198+import com.ubuntuone.android.files.service.U1Service;
1199+import com.ubuntuone.android.files.util.BrowserUtilities;
1200+import com.ubuntuone.android.files.util.ChangeLogUtils;
1201+import com.ubuntuone.android.files.util.ConfigUtilities;
1202+import com.ubuntuone.android.files.util.DialogUtils;
1203+import com.ubuntuone.android.files.util.OAuthUtilities;
1204+import com.ubuntuone.android.files.util.U1HttpUtilities;
1205
1206 /**
1207 * Main application Activity with ~/Ubuntu One files and folders.
1208
1209=== modified file 'src/com/ubuntuone/android/files/FilesListCursorAdapter.java'
1210--- src/com/ubuntuone/androidu1/FilesListCursorAdapter.java 2010-08-15 18:01:00 +0000
1211+++ src/com/ubuntuone/android/files/FilesListCursorAdapter.java 2010-10-26 16:39:53 +0000
1212@@ -18,7 +18,7 @@
1213 * along with this program. If not, see http://www.gnu.org/licenses
1214 */
1215
1216-package com.ubuntuone.androidu1;
1217+package com.ubuntuone.android.files;
1218
1219 import android.content.Context;
1220 import android.database.Cursor;
1221@@ -30,10 +30,10 @@
1222 import android.widget.ImageView;
1223 import android.widget.TextView;
1224
1225-import com.ubuntuone.androidu1.provider.U1CloudProviderUtils;
1226-import com.ubuntuone.androidu1.provider.U1CloudProviderUtils.CloudFiles;
1227-import com.ubuntuone.androidu1.util.DateUtilities;
1228-import com.ubuntuone.androidu1.util.FileUtils;
1229+import com.ubuntuone.android.files.provider.U1CloudProviderUtils;
1230+import com.ubuntuone.android.files.provider.U1CloudProviderUtils.CloudFiles;
1231+import com.ubuntuone.android.files.util.DateUtilities;
1232+import com.ubuntuone.android.files.util.FileUtils;
1233
1234 /**
1235 * Custom FilesList Activity cursor adapter.
1236
1237=== modified file 'src/com/ubuntuone/android/files/IAndroidU1.aidl'
1238--- src/com/ubuntuone/androidu1/IAndroidU1.aidl 2010-08-12 23:20:10 +0000
1239+++ src/com/ubuntuone/android/files/IAndroidU1.aidl 2010-10-26 16:39:53 +0000
1240@@ -1,4 +1,4 @@
1241-package com.ubuntuone.androidu1;
1242+package com.ubuntuone.android.files;
1243
1244 interface IAndroidU1 {
1245 void onGotRoot(in String root);
1246
1247=== modified file 'src/com/ubuntuone/android/files/Preferences.java'
1248--- src/com/ubuntuone/androidu1/Preferences.java 2010-08-15 18:01:00 +0000
1249+++ src/com/ubuntuone/android/files/Preferences.java 2010-10-26 16:39:53 +0000
1250@@ -18,7 +18,7 @@
1251 * along with this program. If not, see http://www.gnu.org/licenses
1252 */
1253
1254-package com.ubuntuone.androidu1;
1255+package com.ubuntuone.android.files;
1256
1257 import android.app.AlertDialog;
1258 import android.content.Context;
1259@@ -45,11 +45,11 @@
1260 import android.util.Log;
1261 import android.widget.Toast;
1262
1263-import com.ubuntuone.androidu1.provider.U1CloudProviderUtils.CloudFiles;
1264-import com.ubuntuone.androidu1.util.BrowserUtilities;
1265-import com.ubuntuone.androidu1.util.ChangeLogUtils;
1266-import com.ubuntuone.androidu1.util.LogCollector;
1267-import com.ubuntuone.androidu1.util.U1HttpUtilities;
1268+import com.ubuntuone.android.files.provider.U1CloudProviderUtils.CloudFiles;
1269+import com.ubuntuone.android.files.util.BrowserUtilities;
1270+import com.ubuntuone.android.files.util.ChangeLogUtils;
1271+import com.ubuntuone.android.files.util.LogCollector;
1272+import com.ubuntuone.android.files.util.U1HttpUtilities;
1273
1274 /**
1275 * Application Preferences Activity and preferences utilities.
1276@@ -250,8 +250,8 @@
1277 new AlertDialog.Builder(Preferences.this)
1278 .setTitle("Are you sure?")
1279 .setMessage("If you remove this device, " +
1280- "your files will not be removed neither locally " +
1281- "nor remotely (from Ubuntu One).")
1282+ "your files will not be removed either locally " +
1283+ "or remotely (from Ubuntu One).")
1284 .setPositiveButton("Remove", new OnClickListener() {
1285 @Override
1286 public void onClick(DialogInterface dialog, int which) {
1287@@ -310,12 +310,8 @@
1288 contact.setOnPreferenceClickListener(new OnPreferenceClickListener() {
1289 @Override
1290 public boolean onPreferenceClick(Preference preference) {
1291- final Intent emailIntent = new Intent(Intent.ACTION_SEND);
1292- emailIntent.setType("plain/text");
1293- emailIntent.putExtra(Intent.EXTRA_EMAIL,
1294- new String[] { "mkarnicki@gmail.com" });
1295- emailIntent.putExtra(Intent.EXTRA_SUBJECT, "AndroidU1 feedback");
1296- startActivity(Intent.createChooser(emailIntent, "Send mail"));
1297+ final Intent askIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://answers.edge.launchpad.net/ubuntuone-android-files/+faqs"));
1298+ startActivity(askIntent);
1299 return true;
1300 }
1301 });
1302@@ -422,7 +418,7 @@
1303 @Override
1304 public boolean onPreferenceClick(Preference preference) {
1305 startActivity(new Intent(Intent.ACTION_VIEW,
1306- Uri.parse("https://launchpad.net/androidu1")));
1307+ Uri.parse("https://launchpad.net/ubuntuone-android-files")));
1308 return true;
1309 }
1310 });
1311
1312=== modified file 'src/com/ubuntuone/android/files/net/INetworkListener.java'
1313--- src/com/ubuntuone/androidu1/net/INetworkListener.java 2010-08-09 18:56:26 +0000
1314+++ src/com/ubuntuone/android/files/net/INetworkListener.java 2010-10-26 16:39:53 +0000
1315@@ -18,7 +18,7 @@
1316 * along with this program. If not, see http://www.gnu.org/licenses
1317 */
1318
1319-package com.ubuntuone.androidu1.net;
1320+package com.ubuntuone.android.files.net;
1321
1322 public interface INetworkListener {
1323
1324
1325=== modified file 'src/com/ubuntuone/android/files/net/NetworkObserver.java'
1326--- src/com/ubuntuone/androidu1/net/NetworkObserver.java 2010-08-12 23:20:10 +0000
1327+++ src/com/ubuntuone/android/files/net/NetworkObserver.java 2010-10-26 16:39:53 +0000
1328@@ -18,7 +18,7 @@
1329 * along with this program. If not, see http://www.gnu.org/licenses
1330 */
1331
1332-package com.ubuntuone.androidu1.net;
1333+package com.ubuntuone.android.files.net;
1334
1335 import android.app.Service;
1336 import android.content.BroadcastReceiver;
1337@@ -30,7 +30,7 @@
1338 import android.util.Config;
1339 import android.util.Log;
1340
1341-import com.ubuntuone.androidu1.AndroidU1;
1342+import com.ubuntuone.android.files.AndroidU1;
1343
1344 public class NetworkObserver extends BroadcastReceiver {
1345
1346
1347=== modified file 'src/com/ubuntuone/android/files/provider/U1CloudProvider.java'
1348--- src/com/ubuntuone/androidu1/provider/U1CloudProvider.java 2010-08-12 23:20:10 +0000
1349+++ src/com/ubuntuone/android/files/provider/U1CloudProvider.java 2010-10-26 16:39:53 +0000
1350@@ -18,7 +18,7 @@
1351 * along with this program. If not, see http://www.gnu.org/licenses
1352 */
1353
1354-package com.ubuntuone.androidu1.provider;
1355+package com.ubuntuone.android.files.provider;
1356
1357 import java.util.HashMap;
1358
1359@@ -37,9 +37,9 @@
1360 import android.util.Config;
1361 import android.util.Log;
1362
1363-import com.ubuntuone.androidu1.AndroidU1;
1364-import com.ubuntuone.androidu1.Preferences;
1365-import com.ubuntuone.androidu1.provider.U1CloudProviderUtils.CloudFiles;
1366+import com.ubuntuone.android.files.AndroidU1;
1367+import com.ubuntuone.android.files.Preferences;
1368+import com.ubuntuone.android.files.provider.U1CloudProviderUtils.CloudFiles;
1369
1370 /**
1371 * AndroidU1 custom content provider serving files and related info.
1372@@ -54,7 +54,7 @@
1373 private static boolean LOCAL_LOGV = Config.DEBUG || Log.isLoggable(TAG, Log.VERBOSE);
1374 private static boolean LOCAL_LOGW = Log.isLoggable(TAG, Log.WARN);
1375
1376- private static final String DATABASE_NAME = "androidu1.db";
1377+ private static final String DATABASE_NAME = "ubuntone-files.db";
1378 private static final int DATABASE_VERSION = 1;
1379 public static final String TABLE_FILES = "files";
1380
1381
1382=== modified file 'src/com/ubuntuone/android/files/provider/U1CloudProviderUtils.java'
1383--- src/com/ubuntuone/androidu1/provider/U1CloudProviderUtils.java 2010-08-15 18:01:00 +0000
1384+++ src/com/ubuntuone/android/files/provider/U1CloudProviderUtils.java 2010-10-26 16:39:53 +0000
1385@@ -18,7 +18,7 @@
1386 * along with this program. If not, see http://www.gnu.org/licenses
1387 */
1388
1389-package com.ubuntuone.androidu1.provider;
1390+package com.ubuntuone.android.files.provider;
1391
1392 import android.content.ContentValues;
1393 import android.content.Context;
1394@@ -28,7 +28,7 @@
1395 import android.provider.BaseColumns;
1396 import android.text.TextUtils;
1397
1398-import com.ubuntuone.androidu1.AndroidU1;
1399+import com.ubuntuone.android.files.AndroidU1;
1400
1401 /**
1402 * U1CloudProvider utilities.
1403@@ -39,7 +39,7 @@
1404 /**
1405 * Unique authority of U1CloudProvider
1406 */
1407- public static final String AUTHORITY = "com.ubuntuone.androidu1.provider.u1cloudprovider";
1408+ public static final String AUTHORITY = "com.ubuntuone.android.files.provider.u1cloudprovider";
1409
1410 public static final String TYPE_DIRECTORY = "DIRECTORY";
1411
1412@@ -58,12 +58,12 @@
1413 /**
1414 * The MIME type of {@link #CONTENT_URI} providing a directory of cloud files.
1415 */
1416- public static final String CONTENT_TYPE = "vnd.androidu1.cursor.dir/vnd.androidu1.cloudfile";
1417+ public static final String CONTENT_TYPE = "vnd.ubuntuonefiles.cursor.dir/vnd.ubuntuonefiles.cloudfile";
1418
1419 /**
1420 * The MIME type of a {@link #CONTENT_URI} sub-directory of a single cloud file.
1421 */
1422- public static final String CONTENT_ITEM_TYPE = "vnd.androidu1.cursor.item/vnd.androidu1.cloudfile";
1423+ public static final String CONTENT_ITEM_TYPE = "vnd.ubuntuonefiles.cursor.item/vnd.ubuntuonefiles.cloudfile";
1424
1425 /**
1426 * Alphabetical order for this table
1427
1428=== modified file 'src/com/ubuntuone/android/files/service/IU1Service.aidl'
1429--- src/com/ubuntuone/androidu1/service/IU1Service.aidl 2010-08-15 18:01:00 +0000
1430+++ src/com/ubuntuone/android/files/service/IU1Service.aidl 2010-10-26 16:39:53 +0000
1431@@ -1,6 +1,6 @@
1432-package com.ubuntuone.androidu1.service;
1433+package com.ubuntuone.android.files.service;
1434
1435-import com.ubuntuone.androidu1.IAndroidU1;
1436+import com.ubuntuone.android.files.IAndroidU1;
1437
1438 interface IU1Service {
1439
1440
1441=== modified file 'src/com/ubuntuone/android/files/service/U1Client.java'
1442--- src/com/ubuntuone/androidu1/service/U1Client.java 2010-08-16 00:16:56 +0000
1443+++ src/com/ubuntuone/android/files/service/U1Client.java 2010-10-26 16:39:53 +0000
1444@@ -18,7 +18,7 @@
1445 * along with this program. If not, see http://www.gnu.org/licenses
1446 */
1447
1448-package com.ubuntuone.androidu1.service;
1449+package com.ubuntuone.android.files.service;
1450
1451 import java.io.ByteArrayInputStream;
1452 import java.io.ByteArrayOutputStream;
1453@@ -53,12 +53,12 @@
1454 import com.twistedmatrix.internet.Deferred;
1455 import com.twistedmatrix.internet.Deferred.Callback;
1456 import com.twistedmatrix.internet.Deferred.Failure;
1457-import com.ubuntuone.androidu1.AndroidU1;
1458-import com.ubuntuone.androidu1.Preferences;
1459-import com.ubuntuone.androidu1.provider.U1CloudProviderUtils;
1460-import com.ubuntuone.androidu1.provider.U1CloudProviderUtils.CloudFiles;
1461-import com.ubuntuone.androidu1.util.FileUtils;
1462-import com.ubuntuone.androidu1.util.OAuthUtilities;
1463+import com.ubuntuone.android.files.AndroidU1;
1464+import com.ubuntuone.android.files.Preferences;
1465+import com.ubuntuone.android.files.provider.U1CloudProviderUtils;
1466+import com.ubuntuone.android.files.provider.U1CloudProviderUtils.CloudFiles;
1467+import com.ubuntuone.android.files.util.FileUtils;
1468+import com.ubuntuone.android.files.util.OAuthUtilities;
1469 import com.ubuntuone.storageprotocol.Client;
1470 import com.ubuntuone.storageprotocol.HashUtils;
1471 import com.ubuntuone.storageprotocol.IConnector;
1472
1473=== modified file 'src/com/ubuntuone/android/files/service/U1Service.java'
1474--- src/com/ubuntuone/androidu1/service/U1Service.java 2010-08-16 00:16:56 +0000
1475+++ src/com/ubuntuone/android/files/service/U1Service.java 2010-10-26 16:39:53 +0000
1476@@ -18,7 +18,7 @@
1477 * along with this program. If not, see http://www.gnu.org/licenses
1478 */
1479
1480-package com.ubuntuone.androidu1.service;
1481+package com.ubuntuone.android.files.service;
1482
1483 import android.app.Notification;
1484 import android.app.NotificationManager;
1485@@ -34,13 +34,13 @@
1486 import android.util.Config;
1487 import android.util.Log;
1488
1489-import com.ubuntuone.androidu1.AndroidU1;
1490-import com.ubuntuone.androidu1.FilesList;
1491-import com.ubuntuone.androidu1.IAndroidU1;
1492-import com.ubuntuone.androidu1.Preferences;
1493-import com.ubuntuone.androidu1.R;
1494-import com.ubuntuone.androidu1.net.INetworkListener;
1495-import com.ubuntuone.androidu1.net.NetworkObserver;
1496+import com.ubuntuone.android.files.AndroidU1;
1497+import com.ubuntuone.android.files.FilesList;
1498+import com.ubuntuone.android.files.IAndroidU1;
1499+import com.ubuntuone.android.files.Preferences;
1500+import com.ubuntuone.android.files.R;
1501+import com.ubuntuone.android.files.net.INetworkListener;
1502+import com.ubuntuone.android.files.net.NetworkObserver;
1503 import com.ubuntuone.storageprotocol.IConnector;
1504 import com.ubuntuone.storageprotocol.oio.OIOConnector;
1505
1506@@ -63,12 +63,12 @@
1507 /**
1508 * Intent action to start the service.
1509 */
1510- public static final String ACTION_START = "com.ubuntuone.androidu1.service.ACTION_START";
1511+ public static final String ACTION_START = "com.ubuntuone.android.files.service.ACTION_START";
1512
1513 /**
1514 * Intent action to stop the service.
1515 */
1516- public static final String ACTION_STOP = "com.ubuntuone.androidu1.service.ACTION_STOP";
1517+ public static final String ACTION_STOP = "com.ubuntuone.android.files.service.ACTION_STOP";
1518
1519 private Notification mNotification;
1520
1521
1522=== modified file 'src/com/ubuntuone/android/files/sso/SSO.java'
1523--- src/com/ubuntuone/androidu1/sso/SSO.java 2010-08-12 23:20:10 +0000
1524+++ src/com/ubuntuone/android/files/sso/SSO.java 2010-10-26 16:39:53 +0000
1525@@ -18,7 +18,7 @@
1526 * along with this program. If not, see http://www.gnu.org/licenses
1527 */
1528
1529-package com.ubuntuone.androidu1.sso;
1530+package com.ubuntuone.android.files.sso;
1531
1532 import android.app.Activity;
1533 import android.content.ComponentName;
1534@@ -31,9 +31,9 @@
1535 import android.widget.Button;
1536 import android.widget.TextView;
1537
1538-import com.ubuntuone.androidu1.AndroidU1;
1539-import com.ubuntuone.androidu1.Preferences;
1540-import com.ubuntuone.androidu1.R;
1541+import com.ubuntuone.android.files.AndroidU1;
1542+import com.ubuntuone.android.files.Preferences;
1543+import com.ubuntuone.android.files.R;
1544
1545 /**
1546 * Proof of concept Ubuntu SSO activity, which can share OAuth token with
1547
1548=== modified file 'src/com/ubuntuone/android/files/util/BrowserUtilities.java'
1549--- src/com/ubuntuone/androidu1/util/BrowserUtilities.java 2010-08-12 23:20:10 +0000
1550+++ src/com/ubuntuone/android/files/util/BrowserUtilities.java 2010-10-26 16:39:53 +0000
1551@@ -18,7 +18,7 @@
1552 * along with this program. If not, see http://www.gnu.org/licenses
1553 */
1554
1555-package com.ubuntuone.androidu1.util;
1556+package com.ubuntuone.android.files.util;
1557
1558 import android.content.Context;
1559 import android.content.Intent;
1560
1561=== modified file 'src/com/ubuntuone/android/files/util/ChangeLogUtils.java'
1562--- src/com/ubuntuone/androidu1/util/ChangeLogUtils.java 2010-08-12 23:20:10 +0000
1563+++ src/com/ubuntuone/android/files/util/ChangeLogUtils.java 2010-10-26 16:39:53 +0000
1564@@ -18,7 +18,7 @@
1565 * along with this program. If not, see http://www.gnu.org/licenses
1566 */
1567
1568-package com.ubuntuone.androidu1.util;
1569+package com.ubuntuone.android.files.util;
1570
1571 import java.io.BufferedReader;
1572 import java.io.IOException;
1573@@ -34,9 +34,9 @@
1574 import android.content.pm.PackageManager.NameNotFoundException;
1575 import android.text.Html;
1576
1577-import com.ubuntuone.androidu1.AndroidU1;
1578-import com.ubuntuone.androidu1.Preferences;
1579-import com.ubuntuone.androidu1.R;
1580+import com.ubuntuone.android.files.AndroidU1;
1581+import com.ubuntuone.android.files.Preferences;
1582+import com.ubuntuone.android.files.R;
1583
1584 /**
1585 * @author Michał Karnicki <mkarnicki@gmail.com>
1586
1587=== modified file 'src/com/ubuntuone/android/files/util/ConfigUtilities.java'
1588--- src/com/ubuntuone/androidu1/util/ConfigUtilities.java 2010-08-12 23:20:10 +0000
1589+++ src/com/ubuntuone/android/files/util/ConfigUtilities.java 2010-10-26 16:39:53 +0000
1590@@ -18,7 +18,7 @@
1591 * along with this program. If not, see http://www.gnu.org/licenses
1592 */
1593
1594-package com.ubuntuone.androidu1.util;
1595+package com.ubuntuone.android.files.util;
1596
1597 import android.content.Context;
1598 import android.net.ConnectivityManager;
1599
1600=== modified file 'src/com/ubuntuone/android/files/util/DateUtilities.java'
1601--- src/com/ubuntuone/androidu1/util/DateUtilities.java 2010-08-12 23:20:10 +0000
1602+++ src/com/ubuntuone/android/files/util/DateUtilities.java 2010-10-26 16:39:53 +0000
1603@@ -18,7 +18,7 @@
1604 * along with this program. If not, see http://www.gnu.org/licenses
1605 */
1606
1607-package com.ubuntuone.androidu1.util;
1608+package com.ubuntuone.android.files.util;
1609
1610 /**
1611 * Convenience utilities related to dates.
1612
1613=== modified file 'src/com/ubuntuone/android/files/util/DialogUtils.java'
1614--- src/com/ubuntuone/androidu1/util/DialogUtils.java 2010-08-12 23:20:10 +0000
1615+++ src/com/ubuntuone/android/files/util/DialogUtils.java 2010-10-26 16:39:53 +0000
1616@@ -18,7 +18,7 @@
1617 * along with this program. If not, see http://www.gnu.org/licenses
1618 */
1619
1620-package com.ubuntuone.androidu1.util;
1621+package com.ubuntuone.android.files.util;
1622
1623 import android.app.ProgressDialog;
1624 import android.content.Context;
1625
1626=== modified file 'src/com/ubuntuone/android/files/util/FileUtils.java'
1627--- src/com/ubuntuone/androidu1/util/FileUtils.java 2010-08-15 18:01:00 +0000
1628+++ src/com/ubuntuone/android/files/util/FileUtils.java 2010-10-26 16:39:53 +0000
1629@@ -18,7 +18,7 @@
1630 * along with this program. If not, see http://www.gnu.org/licenses
1631 */
1632
1633-package com.ubuntuone.androidu1.util;
1634+package com.ubuntuone.android.files.util;
1635
1636 import java.io.File;
1637 import java.io.FileNotFoundException;
1638
1639=== modified file 'src/com/ubuntuone/android/files/util/LogCollector.java'
1640--- src/com/ubuntuone/androidu1/util/LogCollector.java 2010-08-15 18:01:00 +0000
1641+++ src/com/ubuntuone/android/files/util/LogCollector.java 2010-10-26 16:39:53 +0000
1642@@ -1,4 +1,4 @@
1643-package com.ubuntuone.androidu1.util;
1644+package com.ubuntuone.android.files.util;
1645
1646 import java.util.List;
1647
1648@@ -72,7 +72,7 @@
1649 String current = "";
1650 final PackageManager pm = ctx.getPackageManager();
1651 try {
1652- PackageInfo pi = pm.getPackageInfo("com.ubuntuone.androidu1", 0);
1653+ PackageInfo pi = pm.getPackageInfo("com.ubuntuone.android.files", 0);
1654 current = pi.versionName;
1655 } catch (NameNotFoundException e) {
1656 e.printStackTrace();
1657
1658=== modified file 'src/com/ubuntuone/android/files/util/OAuthUtilities.java'
1659--- src/com/ubuntuone/androidu1/util/OAuthUtilities.java 2010-08-12 23:20:10 +0000
1660+++ src/com/ubuntuone/android/files/util/OAuthUtilities.java 2010-10-26 16:39:53 +0000
1661@@ -18,7 +18,7 @@
1662 * along with this program. If not, see http://www.gnu.org/licenses
1663 */
1664
1665-package com.ubuntuone.androidu1.util;
1666+package com.ubuntuone.android.files.util;
1667
1668 import java.net.URLEncoder;
1669
1670@@ -37,8 +37,8 @@
1671 import android.util.Config;
1672 import android.util.Log;
1673
1674-import com.ubuntuone.androidu1.AndroidU1;
1675-import com.ubuntuone.androidu1.Preferences;
1676+import com.ubuntuone.android.files.AndroidU1;
1677+import com.ubuntuone.android.files.Preferences;
1678
1679 /**
1680 * OAuth utilities as well as OAuthClient class for easy OAuth management.
1681@@ -70,7 +70,7 @@
1682 U1_BASE_URL + "/api/account/";
1683
1684 // browser callback URI
1685- public static final Uri CALLBACK_URI = Uri.parse("x-androidu1://oauth");
1686+ public static final Uri CALLBACK_URI = Uri.parse("x-ubuntuone-files://oauth");
1687
1688 // Ubuntu One OAuth clients should hold that object around
1689 public static class OAuthClient {
1690
1691=== modified file 'src/com/ubuntuone/android/files/util/U1HttpUtilities.java'
1692--- src/com/ubuntuone/androidu1/util/U1HttpUtilities.java 2010-08-12 23:20:10 +0000
1693+++ src/com/ubuntuone/android/files/util/U1HttpUtilities.java 2010-10-26 16:39:53 +0000
1694@@ -18,7 +18,7 @@
1695 * along with this program. If not, see http://www.gnu.org/licenses
1696 */
1697
1698-package com.ubuntuone.androidu1.util;
1699+package com.ubuntuone.android.files.util;
1700
1701 import java.io.ByteArrayOutputStream;
1702 import java.io.IOException;
1703@@ -40,8 +40,8 @@
1704 import android.util.Config;
1705 import android.util.Log;
1706
1707-import com.ubuntuone.androidu1.AndroidU1;
1708-import com.ubuntuone.androidu1.Preferences;
1709+import com.ubuntuone.android.files.AndroidU1;
1710+import com.ubuntuone.android.files.Preferences;
1711
1712 /**
1713 * Some Ubuntu One http requests utilities.

Subscribers

People subscribed via source and target branches