projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a4ba617
)
Updated some minor strings with the new app package
author
David A. Velasco
<dvelasco@solidgear.es>
Wed, 1 Aug 2012 08:00:43 +0000
(10:00 +0200)
committer
David A. Velasco
<dvelasco@solidgear.es>
Wed, 1 Aug 2012 08:00:43 +0000
(10:00 +0200)
src/com/owncloud/android/authenticator/AccountAuthenticator.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/location/LocationServiceLauncherReciever.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/activity/LandingActivity.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/activity/PinCodeActivity.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/activity/Preferences.java
patch
|
blob
|
blame
|
history
diff --git
a/src/com/owncloud/android/authenticator/AccountAuthenticator.java
b/src/com/owncloud/android/authenticator/AccountAuthenticator.java
index
543b0df
..
58919ec
100644
(file)
--- a/
src/com/owncloud/android/authenticator/AccountAuthenticator.java
+++ b/
src/com/owncloud/android/authenticator/AccountAuthenticator.java
@@
-41,7
+41,7
@@
public class AccountAuthenticator extends AbstractAccountAuthenticator {
/**
\r
* Value under this key should handle path to webdav php script. Will be
\r
* removed and usage should be replaced by combining
\r
/**
\r
* Value under this key should handle path to webdav php script. Will be
\r
* removed and usage should be replaced by combining
\r
- * {@link
eu.alefzero.owncloud.authenticator
.KEY_OC_BASE_URL} and
\r
+ * {@link
com.owncloud.android.authenticator.AuthenticatorActivity
.KEY_OC_BASE_URL} and
\r
* {@link com.owncloud.android.utils.OwnCloudVersion}
\r
*
\r
* @deprecated
\r
* {@link com.owncloud.android.utils.OwnCloudVersion}
\r
*
\r
* @deprecated
\r
diff --git
a/src/com/owncloud/android/location/LocationServiceLauncherReciever.java
b/src/com/owncloud/android/location/LocationServiceLauncherReciever.java
index
19efd7e
..
b1beda1
100644
(file)
--- a/
src/com/owncloud/android/location/LocationServiceLauncherReciever.java
+++ b/
src/com/owncloud/android/location/LocationServiceLauncherReciever.java
@@
-34,7
+34,7
@@
public class LocationServiceLauncherReciever extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) {
Intent deviceTrackingIntent = new Intent();
deviceTrackingIntent
public void onReceive(Context context, Intent intent) {
Intent deviceTrackingIntent = new Intent();
deviceTrackingIntent
- .setAction("
eu.alefzero.ownclou
d.location.LocationUpdateService");
+ .setAction("
com.owncloud.androi
d.location.LocationUpdateService");
SharedPreferences preferences = PreferenceManager
.getDefaultSharedPreferences(context);
boolean trackDevice = preferences.getBoolean("enable_devicetracking",
SharedPreferences preferences = PreferenceManager
.getDefaultSharedPreferences(context);
boolean trackDevice = preferences.getBoolean("enable_devicetracking",
@@
-57,7
+57,7
@@
public class LocationServiceLauncherReciever extends BroadcastReceiver {
private void startOrStopDeviceTracking(Context context, boolean trackDevice) {
Intent deviceTrackingIntent = new Intent();
deviceTrackingIntent
private void startOrStopDeviceTracking(Context context, boolean trackDevice) {
Intent deviceTrackingIntent = new Intent();
deviceTrackingIntent
- .setAction("
eu.alefzero.ownclou
d.location.LocationUpdateService");
+ .setAction("
com.owncloud.androi
d.location.LocationUpdateService");
if (!isDeviceTrackingServiceRunning(context) && trackDevice) {
Log.d(TAG, "Starting device tracker service");
context.startService(deviceTrackingIntent);
if (!isDeviceTrackingServiceRunning(context) && trackDevice) {
Log.d(TAG, "Starting device tracker service");
context.startService(deviceTrackingIntent);
diff --git
a/src/com/owncloud/android/ui/activity/LandingActivity.java
b/src/com/owncloud/android/ui/activity/LandingActivity.java
index
ce7ff2f
..
3af6485
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/LandingActivity.java
+++ b/
src/com/owncloud/android/ui/activity/LandingActivity.java
@@
-64,7
+64,7
@@
public class LandingActivity extends SherlockFragmentActivity implements
// Start device tracking service
\r
Intent locationServiceIntent = new Intent();
\r
locationServiceIntent
\r
// Start device tracking service
\r
Intent locationServiceIntent = new Intent();
\r
locationServiceIntent
\r
- .setAction("
eu.alefzero.ownclou
d.location.LocationLauncher");
\r
+ .setAction("
com.owncloud.androi
d.location.LocationLauncher");
\r
sendBroadcast(locationServiceIntent);
\r
}
\r
\r
sendBroadcast(locationServiceIntent);
\r
}
\r
\r
diff --git
a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
index
fc3926d
..
4cc224a
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/
src/com/owncloud/android/ui/activity/PinCodeActivity.java
@@
-49,8
+49,8
@@
import android.widget.TextView;
public class PinCodeActivity extends SherlockFragmentActivity {
public class PinCodeActivity extends SherlockFragmentActivity {
- public final static String EXTRA_ACTIVITY = "
eu.alefzero.ownclou
d.ui.activity.PinCodeActivity.ACTIVITY";
- public final static String EXTRA_NEW_STATE = "
eu.alefzero.ownclou
d.ui.activity.PinCodeActivity.NEW_STATE";
+ public final static String EXTRA_ACTIVITY = "
com.owncloud.androi
d.ui.activity.PinCodeActivity.ACTIVITY";
+ public final static String EXTRA_NEW_STATE = "
com.owncloud.androi
d.ui.activity.PinCodeActivity.NEW_STATE";
Button bCancel;
TextView mPinHdr;
Button bCancel;
TextView mPinHdr;
diff --git
a/src/com/owncloud/android/ui/activity/Preferences.java
b/src/com/owncloud/android/ui/activity/Preferences.java
index
7b23856
..
ca13416
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/Preferences.java
+++ b/
src/com/owncloud/android/ui/activity/Preferences.java
@@
-227,7
+227,7
@@
public class Preferences extends SherlockPreferenceActivity implements
else if (preference.equals(mDeviceTracking)) {
\r
Intent locationServiceIntent = new Intent();
\r
locationServiceIntent
\r
else if (preference.equals(mDeviceTracking)) {
\r
Intent locationServiceIntent = new Intent();
\r
locationServiceIntent
\r
- .setAction("
eu.alefzero.ownclou
d.location.LocationLauncher");
\r
+ .setAction("
com.owncloud.androi
d.location.LocationLauncher");
\r
locationServiceIntent.putExtra("TRACKING_SETTING",
\r
(Boolean) newValue);
\r
sendBroadcast(locationServiceIntent);
\r
locationServiceIntent.putExtra("TRACKING_SETTING",
\r
(Boolean) newValue);
\r
sendBroadcast(locationServiceIntent);
\r