[tor-commits] [orbot/master] updating/cleaning project manifest files
n8fr8 at torproject.org
n8fr8 at torproject.org
Wed Nov 2 00:40:06 UTC 2011
commit 4dda90e4801bcf54da49f4f2badb825ba14f7b36
Author: Nathan Freitas <nathan at freitas.net>
Date: Tue Nov 1 20:35:51 2011 -0400
updating/cleaning project manifest files
---
AndroidManifest.xml | 4 +-
AndroidManifest.xml.debug | 61 ----------------------------------------
AndroidManifest.xml.production | 61 ----------------------------------------
3 files changed, 2 insertions(+), 124 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ed256ff..365d3f9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.torproject.android" android:versionName="0.2.3.6-alpha-orbot-1.0.6-RC2" android:versionCode="18">
+ package="org.torproject.android" android:versionName="0.2.3.7-alpha-orbot-1.0.6-RC3" android:versionCode="19">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<application android:theme="@style/DefaultTheme" android:icon="@drawable/icon"
- android:label="@string/app_name" android:debuggable="true">
+ android:label="@string/app_name" android:debuggable="false">
<activity android:name=".Orbot"
android:theme="@android:style/Theme.NoTitleBar">
diff --git a/AndroidManifest.xml.debug b/AndroidManifest.xml.debug
deleted file mode 100644
index 22b69dd..0000000
--- a/AndroidManifest.xml.debug
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.20110503a-dev-debug"
- android:versionCode="13">
-
- <uses-permission android:name="android.permission.INTERNET" />
-
-
- <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
-
- <activity android:name=".Orbot"
- android:theme="@android:style/Theme.NoTitleBar">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- </intent-filter>
-
- <intent-filter>
- <category android:name="android.intent.category.DEFAULT" />
- <action android:name="org.torproject.android.REQUEST_HS_PORT" />
- </intent-filter>
- <intent-filter>
- <category android:name="android.intent.category.DEFAULT" />
- <action android:name="org.torproject.android.START_TOR" />
- </intent-filter>
- </activity>
-
- <activity android:name=".SettingsPreferences" android:label="@string/app_name"/>
- <activity android:name=".AppManager" android:label="@string/app_name"/>
- <activity android:name=".WizardActivity" android:label="@string/app_name"/>
-
- <!-- <service android:name=".service.TorService" android:process=":remote"> -->
- <service android:name=".service.TorService">
- <intent-filter>
- <action android:name="org.torproject.android.service.ITorService" />
- <action android:name="org.torproject.android.service.TOR_SERVICE" />
- </intent-filter>
- </service>
-
- <!--
- <receiver android:name=".OnBootReceiver">
- <intent-filter>
- <action
- android:name="android.intent.action.BOOT_COMPLETED" />
- <category android:name="android.intent.category.HOME" />
- </intent-filter>
- </receiver>
- -->
-
- </application>
-
- <uses-sdk android:minSdkVersion="4"/>
-
-
-
-</manifest>
diff --git a/AndroidManifest.xml.production b/AndroidManifest.xml.production
deleted file mode 100644
index 56fc228..0000000
--- a/AndroidManifest.xml.production
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.20110503a" android:versionCode="13">
-
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-
- <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
-
- <activity android:name=".Orbot"
- android:theme="@android:style/Theme.NoTitleBar">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- </intent-filter>
-
- <intent-filter>
- <category android:name="android.intent.category.DEFAULT" />
- <action android:name="org.torproject.android.REQUEST_HS_PORT" />
- </intent-filter>
- <intent-filter>
- <category android:name="android.intent.category.DEFAULT" />
- <action android:name="org.torproject.android.START_TOR" />
- </intent-filter>
- </activity>
-
- <activity android:name=".SettingsPreferences" android:label="@string/app_name"/>
- <activity android:name=".AppManager" android:label="@string/app_name"/>
- <activity android:name=".WizardActivity" android:label="@string/app_name"/>
-
- <service android:enabled="true"
- android:name=".service.TorService"
- android:exported="false"
- >
- <intent-filter>
- <action android:name="org.torproject.android.service.ITorService" />
- <action android:name="org.torproject.android.service.TOR_SERVICE" />
- </intent-filter>
- </service>
-
-
- <receiver android:name=".OnBootReceiver">
- <intent-filter>
- <action
- android:name="android.intent.action.BOOT_COMPLETED" />
- <category android:name="android.intent.category.HOME" />
- </intent-filter>
- </receiver>
-
- </application>
-
- <uses-sdk android:minSdkVersion="4"/>
-
-
-
-</manifest>
More information about the tor-commits
mailing list