X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FUtils.java;h=be7923ba5694d7c1eb169c0eb649fc9cfad8f4cc;hb=0bcf6b2e55caca54187c6011eaa174297480731e;hp=5f7f69c464bdd72c408d7caf2e6025963b9780e7;hpb=10f7c6fc77bfbaba1f1d8c429173cf55671118e3;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/Utils.java b/src/ro/ieval/fonbot/Utils.java
index 5f7f69c..be7923b 100644
--- a/src/ro/ieval/fonbot/Utils.java
+++ b/src/ro/ieval/fonbot/Utils.java
@@ -4,6 +4,7 @@ import static ro.ieval.fonbot.R.string.*;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Locale;
 
@@ -18,6 +19,8 @@ import android.database.Cursor;
 import android.location.LocationManager;
 import android.media.AudioManager;
 import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.provider.ContactsContract.PhoneLookup;
 import android.telephony.SmsManager;
@@ -188,10 +191,8 @@ public final class Utils {
 	 * @throws AssertionError if the given object is null
 	 */
 	public static <T> T toNonNull(@Nullable T object) throws AssertionError{
-		if(object==null){
-			Log.wtf(Utils.class.getName(), "toNonNull called with null");
-			throw new AssertionError("Log.wtf did not terminate the process");
-		}
+		if(object==null)
+			throw new NullPointerException();
 		return object;
 	}
 
@@ -299,7 +300,13 @@ public final class Utils {
 			break;
 
 		case SMS:
-			SmsManager.getDefault().sendTextMessage(address.data, null, message, null, null);
+			new Handler(Looper.getMainLooper()).post(new Runnable(){
+					@Override
+					public void run(){
+						final ArrayList<String> parts = SmsManager.getDefault().divideMessage(message);
+						SmsManager.getDefault().sendMultipartTextMessage(address.data, null, parts, null, null);
+					}
+				});
 			break;
 
 		case LOCAL:
@@ -382,9 +389,10 @@ public final class Utils {
 	 * @throws MalformedURLException if the user preferences create an invalid URL
 	 */
 	public static URL getServerURL(final Context context, final String path) throws MalformedURLException{
+		final String protocol=PreferenceManager.getDefaultSharedPreferences(context).getString("protocol", "https");
 		final String hostname=PreferenceManager.getDefaultSharedPreferences(context).getString("hostname", "fonbot.ieval.ro");
 		final int port=Integer.parseInt(PreferenceManager.getDefaultSharedPreferences(context).getString("port", "443"));
-		final URL url=new URL("http", hostname, port, path);
+		final URL url=new URL(protocol, hostname, port, path);
 		return url;
 	}