Mercurial Mercurial > beem > otr / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authorNikita Kozlov <nikita@beem-project.com>
Sat, 13 Feb 2010 15:46:21 +0100
changeset 656 b78913fc1a08
parent 655 a122632f8622 (diff)
parent 654 6f4814eb7951 (current diff)
child 657 f0ee4f04b3ac
merge
--- a/.classpath	Sat Feb 13 16:22:48 2010 +0100
+++ b/.classpath	Sat Feb 13 15:46:21 2010 +0100
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="lib" path="libs/security.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="libs/jlibrtp.jar"/>
-	<classpathentry kind="lib" path="libs/asmack-jse.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="libs/asmack-jse.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="lib" path="libs/jlibrtp.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
--- a/AndroidManifest.xml	Sat Feb 13 16:22:48 2010 +0100
+++ b/AndroidManifest.xml	Sat Feb 13 15:46:21 2010 +0100
@@ -65,12 +65,13 @@
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
 		</activity>
-		<!-- Could be interesting if we would launch beem at startup
-		<receiver android:name=".tool.BeemBroadcastReceiver" android:enabled="true">
-			<intent-filter>
-				<action android:name="android.intent.action.BOOT_COMPLETED" />
-			</intent-filter>
-		</receiver>  -->
+		<!--
+			Could be interesting if we would launch beem at startup <receiver
+			android:name=".tool.BeemBroadcastReceiver" android:enabled="true">
+			<intent-filter> <action
+			android:name="android.intent.action.BOOT_COMPLETED" />
+			</intent-filter> </receiver>
+		-->
 		<service android:name="BeemService" android:enabled="true"
 			android:label="Beem Service" android:permission="com.beem.project.beem.BEEM_SERVICE">
 			<intent-filter>
@@ -85,6 +86,7 @@
 	<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
 	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"></uses-permission>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
-	<uses-sdk android:minSdkVersion="3"/>
-
+	<uses-sdk android:minSdkVersion="3" />
+	<supports-screens android:largeScreens="true"
+		android:normalScreens="true" android:smallScreens="true" android:anyDensity="true" />
 </manifest> 
--- a/src/com/beem/project/beem/BeemService.java	Sat Feb 13 16:22:48 2010 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Sat Feb 13 15:46:21 2010 +0100
@@ -138,7 +138,7 @@
      * Initialise la configuration de la connexion.
      */
     private void initConnectionConfig() {
-	java.security.Security.addProvider(new com.sun.security.sasl.Provider());
+	//java.security.Security.addProvider(new com.sun.security.sasl.Provider());
 	mUseProxy = mSettings.getBoolean("settings_key_proxy_use", false);
 	if (mUseProxy) {
 	    String stype = mSettings.getString("settings_key_proxy_type", "HTTP");
BEEM-OTR