Commit 2a81da1b authored by Alan McNatty's avatar Alan McNatty
Browse files

Fixing obvious broken path

parent 3cda0a77
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="nz.co.catalyst.MaharaDroid"
package="nz.net.catalyst.MaharaDroid"
android:versionCode="1"
android:versionName="1.0">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
<activity android:name=".MaharaDroid"
android:label="@string/app_name"
......@@ -29,14 +29,14 @@
<activity android:name=".ArtifactSettings" android:label="@string/artifactsettings">
<intent-filter>
<action android:name="nz.co.catalyst.MaharaDroid.ArtifactSettings" />
<action android:name="nz.net.catalyst.MaharaDroid.ArtifactSettings" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".TransferProgress" android:label="@string/transferprogress">
<intent-filter>
<action android:name="nz.co.catalyst.MaharaDroid.TRANSFERPROGRESS" />
<action android:name="nz.net.catalyst.MaharaDroid.TRANSFERPROGRESS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
......@@ -57,6 +57,5 @@
</application>
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
</manifest>
\ No newline at end of file
......@@ -2,7 +2,7 @@
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the Google Android code located in ==
== src/nz/co/catalyst/android/*. ==
== src/nz/net/catalyst/android/*. ==
=========================================================================
Android Code
......
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/
package nz.co.catalyst.MaharaDroid;
public final class R {
public static final class attr {
}
public static final class drawable {
public static final int icon=0x7f020000;
public static final int menu_info=0x7f020001;
public static final int menu_revert=0x7f020002;
}
public static final class id {
public static final int ArtifactConfirmLayout=0x7f080004;
public static final int ArtifactSettingsButtonLayout=0x7f08000a;
public static final int ArtifactSettingsLayout=0x7f080003;
public static final int ArtifactUploadLayout=0x7f080007;
public static final int TransferPictureName=0x7f080014;
public static final int TransferPictureStatus=0x7f080016;
public static final int TransferProgressBar=0x7f080017;
public static final int TransferProgressItemLayout=0x7f080012;
public static final int TransferProgressList=0x7f080011;
public static final int TransferThumbnail=0x7f080013;
public static final int TransferType=0x7f080015;
public static final int UploadArtifact=0x7f080008;
public static final int about=0x7f080018;
public static final int btnCancel=0x7f08000c;
public static final int btnUpload=0x7f08000b;
public static final int chkUpload=0x7f080005;
public static final int image=0x7f080002;
public static final int imgIcon=0x7f08000d;
public static final int prgNotification=0x7f08000f;
public static final int reset=0x7f080019;
public static final int text1=0x7f080000;
public static final int text2=0x7f080001;
public static final int textview=0x7f080010;
public static final int txtArtifactConfirm=0x7f080006;
public static final int txtArtifactTitle=0x7f080009;
public static final int txtNotificationTitle=0x7f08000e;
}
public static final class layout {
public static final int about_contrib=0x7f030000;
public static final int about_sponsor=0x7f030001;
public static final int about_text=0x7f030002;
public static final int artifact_settings=0x7f030003;
public static final int progress_notification_layout=0x7f030004;
public static final int text_viewer=0x7f030005;
public static final int transfer_progress=0x7f030006;
public static final int transfer_progress_item=0x7f030007;
}
public static final class menu {
public static final int preferences=0x7f070000;
}
public static final class raw {
public static final int notice=0x7f050000;
}
public static final class string {
public static final int about_code_contributors_section_title=0x7f060021;
public static final int about_license_label=0x7f060024;
public static final int about_licenses_section_title=0x7f060022;
public static final int about_sponsors_section_title=0x7f060020;
/** About page
*/
public static final int about_title=0x7f06001e;
public static final int about_top_section_title=0x7f06001f;
public static final int about_version_label=0x7f060023;
public static final int app_name=0x7f060000;
public static final int artifact_retrieve_error=0x7f060014;
public static final int artifactsettings=0x7f060015;
public static final int btncancellabel=0x7f060012;
public static final int btnok=0x7f06000f;
public static final int btnsendlabel=0x7f060011;
public static final int btnupload=0x7f060010;
public static final int chkupload=0x7f06001c;
public static final int confirmtext=0x7f06001d;
public static final int filetransfers=0x7f06001b;
public static final int lbluploadoptions=0x7f060013;
public static final int pref_menu_about=0x7f06000e;
public static final int pref_menu_reset=0x7f06000d;
public static final int pref_upload_folder_key=0x7f06000a;
public static final int pref_upload_folder_summary=0x7f06000c;
public static final int pref_upload_folder_title=0x7f06000b;
public static final int pref_upload_token_key=0x7f060006;
public static final int pref_upload_token_summary=0x7f060008;
public static final int pref_upload_token_title=0x7f060007;
public static final int pref_upload_url_key=0x7f060003;
public static final int pref_upload_url_summary=0x7f060005;
public static final int pref_upload_url_title=0x7f060004;
public static final int prefcat_advanced=0x7f060009;
public static final int prefs_app_name=0x7f060002;
public static final int startup_text=0x7f060001;
public static final int transferprogress=0x7f060016;
public static final int uploadfinished=0x7f060018;
public static final int uploading=0x7f06001a;
public static final int uploadingartifact=0x7f060019;
public static final int uploadstarting=0x7f060017;
}
public static final class xml {
public static final int about=0x7f040000;
public static final int preferences=0x7f040001;
}
}
......@@ -56,6 +56,28 @@
android:layout_height="wrap_content">
</EditText>
</LinearLayout>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ArtifactFolderLayout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
<ImageView android:id="@+id/UploadFolder"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</ImageView>
<EditText android:text=""
android:id="@+id/txtFolderTitle"
android:singleLine="true"
android:enabled="false"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
</EditText>
</LinearLayout>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ArtifactSettingsButtonLayout"
......
......@@ -18,7 +18,7 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid;
package nz.net.catalyst.MaharaDroid;
import android.app.Activity;
import android.content.Intent;
......
......@@ -18,7 +18,7 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid;
package nz.net.catalyst.MaharaDroid;
import android.app.Activity;
import android.content.ContentResolver;
......
......@@ -19,9 +19,9 @@
* along with ENUM Discoverer. If not, see <http://www.gnu.org/licenses/>.
*/
package nz.co.catalyst.MaharaDroid;
package nz.net.catalyst.MaharaDroid;
import nz.co.catalyst.MaharaDroid.ui.about.AboutActivity;
import nz.net.catalyst.MaharaDroid.ui.about.AboutActivity;
import android.content.Intent;
import android.content.SharedPreferences;
......
......@@ -18,7 +18,7 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid;
package nz.net.catalyst.MaharaDroid;
/*
* The GlobalResources class is taken from the GlobalResources class
......
......@@ -18,7 +18,7 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid;
package nz.net.catalyst.MaharaDroid;
import android.app.Activity;
import android.content.Intent;
......
......@@ -18,7 +18,7 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid;
package nz.net.catalyst.MaharaDroid;
import java.io.FilterOutputStream;
import java.io.IOException;
......
......@@ -18,7 +18,7 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid;
package nz.net.catalyst.MaharaDroid;
import java.io.BufferedReader;
import java.io.File;
......@@ -117,7 +117,7 @@ public class RestClient {
paramNames = pNames.toArray(paramNames);
paramVals = pVals.toArray(paramVals);
Log.d("MaharaDroid", "String url: '" + url + "', String token: '" + token + "', String folder: '" + folder + "', String filename: '" + filename + "'");
//Log.d("MaharaDroid", "String url: '" + url + "', String token: '" + token + "', String folder: '" + folder + "', String filename: '" + filename + "'");
return CallFunction(url, token, folder, filename, paramNames, paramVals, context);
}
......@@ -144,7 +144,7 @@ public class RestClient {
DefaultHttpClient httpclient = new DefaultHttpClient(ccm, http_params);
Log.d("MaharaDroid", "String url: '" + url + "', String token: '" + token + "', String folder: '" + folder + "', String filename: '" + filename + "'");
//Log.d("MaharaDroid", "String url: '" + url + "', String token: '" + token + "', String folder: '" + folder + "', String filename: '" + filename + "'");
if (paramNames == null) {
paramNames = new String[0];
......
......@@ -18,7 +18,7 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid;
package nz.net.catalyst.MaharaDroid;
import java.util.ArrayList;
import java.util.HashMap;
......
......@@ -18,7 +18,7 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid;
package nz.net.catalyst.MaharaDroid;
import java.util.LinkedList;
......
......@@ -18,9 +18,9 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid.ui.about;
package nz.net.catalyst.MaharaDroid.ui.about;
import nz.co.catalyst.MaharaDroid.R;
import nz.net.catalyst.MaharaDroid.R;
import java.io.IOException;
import java.util.ArrayList;
......
......@@ -18,7 +18,7 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid.ui.about;
package nz.net.catalyst.MaharaDroid.ui.about;
import java.util.ArrayList;
import android.view.View;
......
......@@ -18,14 +18,14 @@
* limitations under the License.
*/
package nz.co.catalyst.MaharaDroid.ui.about;
package nz.net.catalyst.MaharaDroid.ui.about;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import nz.co.catalyst.MaharaDroid.R;
import nz.net.catalyst.MaharaDroid.R;
import android.app.Activity;
import android.net.Uri;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment