TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 02:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare against existing Build.VERSION_CODES.

Browse Source 
The 1.X Android versions don't have the 2.X VERSION_CODE
symbols, so comparing against them in order to make 1.6
choices will throw runtime exceptions.
This commit is contained in:
Moxie Marlinspike 2011-12-21 01:35:33 -05:00
parent bbea3fe1b1
commit 8a6a1a5f03
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
View File

@ -77,7 +77,7 @@ public class ApplicationPreferencesActivity extends PreferenceActivity {
super.onCreate(icicle); super.onCreate(icicle);
addPreferencesFromResource(R.xml.preferences); addPreferencesFromResource(R.xml.preferences);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ECLAIR) { if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.DONUT) {
CheckBoxPreference mmsPreference = (CheckBoxPreference)this.findPreference("pref_all_mms"); CheckBoxPreference mmsPreference = (CheckBoxPreference)this.findPreference("pref_all_mms");
mmsPreference.setChecked(false); mmsPreference.setChecked(false);
mmsPreference.setEnabled(false); mmsPreference.setEnabled(false);
@ -133,7 +133,7 @@ public class ApplicationPreferencesActivity extends PreferenceActivity {
} }
public static boolean showIcon() { public static boolean showIcon() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR; return Build.VERSION.SDK_INT > Build.VERSION_CODES.DONUT;
} }
private void handleIdentitySelection(Intent data) { private void handleIdentitySelection(Intent data) {

2
src/org/thoughtcrime/securesms/contacts/ContactAccessor.java
View File

@ -50,7 +50,7 @@ public abstract class ContactAccessor {
if (sInstance == null) { if (sInstance == null) {
String className; String className;
if (Integer.parseInt(Build.VERSION.SDK) < Build.VERSION_CODES.ECLAIR) if (Integer.parseInt(Build.VERSION.SDK) <= Build.VERSION_CODES.DONUT)
className = "ContactAccessorOldApi"; className = "ContactAccessorOldApi";
else else
className = "ContactAccessorNewApi"; className = "ContactAccessorNewApi";

2
src/org/thoughtcrime/securesms/recipients/RecipientFactory.java
View File

@ -47,7 +47,7 @@ public class RecipientFactory {
int sdkVersion = Integer.parseInt(Build.VERSION.SDK); int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
if (sdkVersion < Build.VERSION_CODES.ECLAIR) className = "OldRecipientProvider"; if (sdkVersion <= Build.VERSION_CODES.DONUT) className = "OldRecipientProvider";
else className = "NewRecipientProvider"; else className = "NewRecipientProvider";
try { try {

2
src/org/thoughtcrime/securesms/service/MmsListener.java
View File

@ -33,7 +33,7 @@ import android.util.Log;
public class MmsListener extends BroadcastReceiver { public class MmsListener extends BroadcastReceiver {
private boolean isRelevent(Context context, Intent intent) { private boolean isRelevent(Context context, Intent intent) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ECLAIR) if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.DONUT)
return false; return false;
if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(ApplicationPreferencesActivity.ALL_MMS_PERF, true)) if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(ApplicationPreferencesActivity.ALL_MMS_PERF, true))