Modifications for the lite version of Transdroid (now called Transdrone :).

core/AndroidManifest.xml

@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.transdroid.core"
-	android:versionCode="6"
+	android:versionCode="7"
-	android:versionName="2.0" >
+	android:versionName="2.0.1" >
 
 	<uses-sdk
 		android:minSdkVersion="7"

core/res/layout/fragment_torrents.xml

@@ -74,7 +74,6 @@
 		android:gravity="center"
 		android:maxWidth="400dip"
 		android:padding="@dimen/margin_default"
-		android:text="@string/navigation_nosettings"
 		android:textIsSelectable="false"
 		android:visibility="gone" />
 

core/res/values/changelog.xml

@@ -17,6 +17,10 @@
 -->
 <resources>
 <string name="system_changelog">
+Transdroid 2.0.1\n
+- First Google Play release of the lite version as Transdrone\n
+- First release as auto-update (now checked only once a day)\n
+\n
 Transdroid 2.0.0\n
 - Scrollable home screen widget (Android 3+)\n
 - Allow changing of storage location (Deluge and Transmission)\n

core/res/values/strings.xml

@@ -59,7 +59,7 @@
 	<string name="action_removesettings">Remove settings</string>
 	<string name="action_visitwebsite">Visit transdroid.org</string>
 	
-	<string name="navigation_nosettings">Transdroid allows you to monitor and manage the torrent client you run at home or on your seedbox. Setting things up can be a bit tricky, but we offer step-by-step guides and promise it\'ll be worth it!</string>
+	<string name="navigation_nosettings">%1$s allows you to monitor and manage the torrent client you run at home or on your seedbox. Setting things up can be a bit tricky, but we offer step-by-step guides and promise it\'ll be worth it!</string>
 	<string name="navigation_emptytorrents">Connected, but no torrent are active within the current filter</string>
 	<string name="navigation_emptydetails">Select a torrent to view its details</string>
 	<string name="navigation_servers">SERVERS</string>
@@ -270,17 +270,17 @@
 	<string name="pref_usedarktheme">Use dark UI theme</string>
 	<string name="pref_usedarktheme_info">Requires a restart to take effect</string>
 	<string name="pref_import">Import settings</string>
-	<string name="pref_import_dialog">Transdroid will try to import server, web search, RSS and system settings from: %1$s</string>
+	<string name="pref_import_dialog">%1$s will try to import server, web search, RSS and system settings from: %2$s</string>
 	<string name="pref_import_success">Settings successfully imported</string>
 	<string name="pref_export">Export settings</string>
-	<string name="pref_export_dialog">Transdroid will export server (including passwords), web search, RSS and system settings to the following plain text JSON file: %1$s</string>
+	<string name="pref_export_dialog">%1$s will export server (including passwords), web search, RSS and system settings to the following plain text JSON file: %2$s</string>
 	<string name="pref_export_success">Settings successfully exported</string>
 	<string name="pref_sendlog">Send error log</string>
 	<string name="pref_sendlog_info">Get support or report a bug</string>
 	<string name="pref_installhelp">View install guides</string>
 	<string name="pref_installhelp_info">Available at transdroid.org/download</string>
 	<string name="pref_changelog">Recent changes</string>
-	<string name="pref_about">About Transdroid</string>
+	<string name="pref_about">About %1$s</string>
     <string-array name="pref_daemon_types" translatable="false">
         <item>BitComet</item>
         <item>Bitflu 1.2+</item>
@@ -359,7 +359,7 @@
 	<string name="error_no_link">The RSS feed item does not provide a link to browse to</string>
 	<string name="error_norssfeed">URL is not a (valid) RSS feed</string>
 	<string name="error_media_not_available">SD card not available to read/write</string>
-	<string name="error_no_valid_settings_file">File does not seem to contain Transdroid settings</string>
+	<string name="error_no_valid_settings_file">File does not seem to contain %1$s settings</string>
 	<string name="error_file_not_found">The settings file could not be found</string>
 	<string name="error_cant_write_settings_file">Can\'t write to the settings file</string>
 	<string name="error_notanumber">Please enter a positive number</string>
@@ -371,7 +371,6 @@
 	<string name="update_search_newversion">New Transdroid search module available</string>
 	<string name="update_updateto">You can now update to %1$s</string>
 	
-	<string name="system_name" translatable="false">Transdroid</string>
 	<string name="system_developer" translatable="false">\u00A9 Eric Kok, 2312 development</string>
 	<string name="system_license" translatable="false">Published under GNU General Public License v3</string>
 	<string name="system_librarieslabel">Some code/libraries are used in the project:</string>

core/res/xml/pref_system.xml

@@ -52,7 +52,6 @@
 		android:title="@string/pref_changelog" />
 	
 	<Preference
-		android:key="system_about"
+		android:key="system_about" />
-		android:title="@string/pref_about" />
 
 </PreferenceScreen>

core/src/org/transdroid/core/app/settings/SystemSettings.java

@@ -67,4 +67,13 @@ public class SystemSettings {
 		prefs.edit().putLong("system_lastappupdatecheck", lastChecked == null ? -1L : lastChecked.getTime()).commit();
 	}
 
+	/**
+	 * Whether the custom app update checker should be used to check for new app and search module versions.
+	 * @return True if it should be checked against transdroid.org if there are app updates (as opposed to using the
+	 *         Play Store for updates), false otherwise
+	 */
+	public static boolean enableUpdateChecker(Context context) {
+		return !context.getPackageName().equals("org.transdroid.lite");
+	}
+
 }

core/src/org/transdroid/core/gui/TorrentsFragment.java

@@ -114,6 +114,7 @@ public class TorrentsFragment extends SherlockFragment implements OnLabelPickedL
 		torrentsList.setFastScrollEnabled(true);
 		if (torrents != null)
 			updateTorrents(torrents, currentLabels);
+		nosettingsText.setText(getString(R.string.navigation_nosettings, getString(R.string.app_name)));
 
 	}
 

core/src/org/transdroid/core/gui/navigation/NavigationHelper.java

@@ -208,7 +208,7 @@ public class NavigationHelper {
 		if (start >= 0) {
 			int begin = start + (parameter + "=").length();
 			int end = uri.toString().indexOf("&", begin);
-			return uri.toString().substring(begin, end >= 0? end: uri.toString().length());
+			return uri.toString().substring(begin, end >= 0 ? end : uri.toString().length());
 		}
 		return null;
 	}

core/src/org/transdroid/core/gui/settings/SystemSettingsActivity.java

@@ -26,6 +26,7 @@ import org.json.JSONException;
 import org.transdroid.core.R;
 import org.transdroid.core.app.settings.ApplicationSettings;
 import org.transdroid.core.app.settings.SettingsPersistence;
+import org.transdroid.core.app.settings.SystemSettings;
 import org.transdroid.core.gui.log.ErrorLogSender;
 import org.transdroid.core.gui.navigation.DialogHelper;
 import org.transdroid.core.gui.navigation.NavigationHelper;
@@ -77,12 +78,17 @@ public class SystemSettingsActivity extends SherlockPreferenceActivity {
 		addPreferencesFromResource(R.xml.pref_system);
 
 		// Handle outgoing links and preference changes
+		if (SystemSettings.enableUpdateChecker(this)) {
 			findPreference("system_checkupdates").setOnPreferenceClickListener(onCheckUpdatesClick);
+		} else {
+			getPreferenceScreen().removePreference(findPreference("system_checkupdates"));
+		}
 		findPreference("system_sendlog").setOnPreferenceClickListener(onSendLogClick);
 		findPreference("system_installhelp").setOnPreferenceClickListener(onInstallHelpClick);
 		findPreference("system_changelog").setOnPreferenceClickListener(onChangeLogClick);
 		findPreference("system_importsettings").setOnPreferenceClickListener(onImportSettingsClick);
 		findPreference("system_exportsettings").setOnPreferenceClickListener(onExportSettingsClick);
+		findPreference("system_about").setTitle(getString(R.string.pref_about, getString(R.string.app_name)));
 		findPreference("system_about").setOnPreferenceClickListener(onAboutClick);
 	}
 
@@ -165,7 +171,7 @@ public class SystemSettingsActivity extends SherlockPreferenceActivity {
 			// @formatter:off
 			return new AlertDialog.Builder(this)
 					.setMessage(
-							getString(R.string.pref_import_dialog, SettingsPersistence.DEFAULT_SETTINGS_FILE.toString()))
+							getString(R.string.pref_import_dialog, getString(R.string.app_name), SettingsPersistence.DEFAULT_SETTINGS_FILE.toString()))
 					.setPositiveButton(android.R.string.ok, importSettings)
 					.setNegativeButton(android.R.string.cancel, null).create();
 			// @formatter:on
@@ -173,7 +179,7 @@ public class SystemSettingsActivity extends SherlockPreferenceActivity {
 			// @formatter:off
 			return new AlertDialog.Builder(this)
 					.setMessage(
-							getString(R.string.pref_export_dialog, SettingsPersistence.DEFAULT_SETTINGS_FILE.toString()))
+							getString(R.string.pref_export_dialog, getString(R.string.app_name), SettingsPersistence.DEFAULT_SETTINGS_FILE.toString()))
 					.setPositiveButton(android.R.string.ok, exportSettings)
 					.setNegativeButton(android.R.string.cancel, null).create();
 			// @formatter:on
@@ -193,7 +199,8 @@ public class SystemSettingsActivity extends SherlockPreferenceActivity {
 				Crouton.showText(SystemSettingsActivity.this, R.string.error_file_not_found,
 						NavigationHelper.CROUTON_ERROR_STYLE);
 			} catch (JSONException e) {
-				Crouton.showText(SystemSettingsActivity.this, R.string.error_no_valid_settings_file,
+				Crouton.showText(SystemSettingsActivity.this,
+						getString(R.string.error_no_valid_settings_file, getString(R.string.app_name)),
 						NavigationHelper.CROUTON_ERROR_STYLE);
 			}
 		}

core/src/org/transdroid/core/service/BootReceiver.java

@@ -69,7 +69,7 @@ public class BootReceiver extends BroadcastReceiver {
 	public static void startAppUpdatesService(Context context) {
 		SystemSettings systemSettings = SystemSettings_.getInstance_(context);
 		AlarmManager alarms = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-		if (systemSettings.checkForUpdates() && piAppUpdates == null) {
+		if (SystemSettings.enableUpdateChecker(context) && systemSettings.checkForUpdates() && piAppUpdates == null) {
 
 			Log.d(context, "Boot signal received, starting app update checker service");
 			// Schedule a daily, with the first being (somewhat) in 1 second from now

full/AndroidManifest.xml

@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.transdroid.full"
-	android:versionCode="6"
+	android:versionCode="7"
-	android:versionName="2.0" >
+	android:versionName="2.0.1" >
 
 	<uses-sdk
 		android:minSdkVersion="7"
@@ -46,7 +46,7 @@
 		android:allowBackup="true"
 		android:hardwareAccelerated="true"
 		android:icon="@drawable/ic_launcher"
-		android:label="@string/system_name"
+		android:label="@string/app_name"
 		android:theme="@style/Theme.Sherlock" >
 
 		<!-- Main activities -->

lite/AndroidManifest.xml

@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.transdroid.lite"
-	android:versionCode="6"
+	android:versionCode="7"
-	android:versionName="2.0" >
+	android:versionName="2.0.1" >
 
 	<uses-sdk
 		android:minSdkVersion="7"
@@ -46,7 +46,7 @@
 		android:allowBackup="true"
 		android:hardwareAccelerated="true"
 		android:icon="@drawable/ic_launcher"
-		android:label="@string/system_name"
+		android:label="@string/app_name"
 		android:theme="@style/Theme.Sherlock" >
 
 		<!-- Main activities -->
@@ -61,9 +61,6 @@
 
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.SEARCH" />
-			</intent-filter>
 			<intent-filter>
 				<action android:name="org.transdroid.ADD_MULTIPLE" />
 
@@ -180,15 +177,12 @@
 		<!-- Settings screens -->
 		<activity android:name="org.transdroid.core.gui.settings.MainSettingsActivity_" />
 		<activity android:name="org.transdroid.core.gui.settings.ServerSettingsActivity_" />
-		<activity android:name="org.transdroid.core.gui.settings.WebsearchSettingsActivity_" />
-		<activity android:name="org.transdroid.core.gui.settings.RssfeedSettingsActivity_" />
 		<activity android:name="org.transdroid.core.gui.settings.NotificationSettingsActivity_" />
 		<activity android:name="org.transdroid.core.gui.settings.SystemSettingsActivity_" />
 		<activity android:name="org.transdroid.core.gui.navigation.DialogHelper_" />
 
 		<!-- Background service -->
 		<service android:name="org.transdroid.core.service.ServerCheckerService_" />
-		<service android:name="org.transdroid.core.service.RssCheckerService_" />
 		<service android:name="org.transdroid.core.service.AppUpdateService_" />
 
 		<receiver android:name="org.transdroid.core.service.AlarmReceiver_" />

lite/res/values/strings.xml

@@ -16,6 +16,6 @@
 -->
 <resources>
 
-	<string name="app_name" translatable="false">Transdroid Lite</string>
+	<string name="app_name" translatable="false">Transdrone</string>
 
 </resources>