actually fallback when mms local params unset

// FREEBIE
This commit is contained in:
Jake McGinty 2014-10-15 17:14:12 -07:00
parent cfccd367ad
commit b5941fb3fd

View File

@ -20,6 +20,7 @@ import android.content.Context;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import org.thoughtcrime.securesms.mms.ApnUnavailableException; import org.thoughtcrime.securesms.mms.ApnUnavailableException;
@ -94,9 +95,8 @@ public class ApnDatabase {
} }
protected Apn getLocallyConfiguredMmsConnectionParameters() throws ApnUnavailableException { protected Apn getLocallyConfiguredMmsConnectionParameters() throws ApnUnavailableException {
if (TextSecurePreferences.isUseLocalApnsEnabled(context)) { if (TextSecurePreferences.isUseLocalApnsEnabled(context)) {
String mmsc = TextSecurePreferences.getMmscUrl(context); String mmsc = TextSecurePreferences.getMmscUrl(context).trim();
if (TextUtils.isEmpty(mmsc))
if (mmsc == null)
throw new ApnUnavailableException("Malformed locally configured MMSC."); throw new ApnUnavailableException("Malformed locally configured MMSC.");
if (!mmsc.startsWith("http")) if (!mmsc.startsWith("http"))