TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 14:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #540 from WhisperSystems/lint

Browse Source 
Fixes more lint errors
This commit is contained in:
Moxie Marlinspike 2014-01-11 10:52:32 -08:00
commit 4851a555e7
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@ -5,7 +5,7 @@
android:versionCode="62" android:versionCode="62"
android:versionName="1.0.6"> android:versionName="1.0.6">
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/>
<permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS" <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
android:label="Access to TextSecure Secrets" android:label="Access to TextSecure Secrets"
@ -146,10 +146,6 @@
android:label="@string/AndroidManifest__change_passphrase" android:label="@string/AndroidManifest__change_passphrase"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".VerifyKeysActivity"
android:label="@string/AndroidManifest__verify_session"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".VerifyIdentityActivity" <activity android:name=".VerifyIdentityActivity"
android:label="@string/AndroidManifest__verify_identity" android:label="@string/AndroidManifest__verify_identity"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

2
build.gradle
View File

@ -32,7 +32,7 @@ android {
buildToolsVersion '19.0.0' buildToolsVersion '19.0.0'
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 9
targetSdkVersion 19 targetSdkVersion 19
} }

5
res/values/styles.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources xmlns:tools="http://schemas.android.com/tools">
<style name="NoAnimation.Theme.Sherlock.Light.DarkActionBar" parent="@style/Theme.Sherlock.Light.DarkActionBar"> <style name="NoAnimation.Theme.Sherlock.Light.DarkActionBar" parent="@style/Theme.Sherlock.Light.DarkActionBar">
<item name="android:windowAnimationStyle">@null</item> <item name="android:windowAnimationStyle">@null</item>
</style> </style>
@ -76,7 +76,8 @@
<item name="android:textColor">@color/textsecure_holo_blue_light</item> <item name="android:textColor">@color/textsecure_holo_blue_light</item>
</style> </style>
<style name="TextSecureDialogButtonBar"> <style name="TextSecureDialogButtonBar"
tools:ignore="NewApi">
<item name="android:background">@null</item> <item name="android:background">@null</item>
<item name="android:dividerPadding">0dp</item> <item name="android:dividerPadding">0dp</item>
</style> </style>

14
res/values/themes.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources xmlns:tools="http://schemas.android.com/tools">
<style name="TextSecure.LightTheme" parent="@style/Theme.Sherlock.Light"> <style name="TextSecure.LightTheme" parent="@style/Theme.Sherlock.Light">
<item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_light</item> <item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_light</item>
<item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_light</item> <item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_light</item>
@ -37,7 +37,9 @@
</style> </style>
<style name="TextSecure.LightTheme.NavigationDrawer" parent="@style/TextSecure.LightTheme"> <style name="TextSecure.LightTheme.NavigationDrawer"
parent="@style/TextSecure.LightTheme"
tools:ignore="NewApi">
<item name="android:homeAsUpIndicator">@drawable/ic_drawer</item> <item name="android:homeAsUpIndicator">@drawable/ic_drawer</item>
<item name="homeAsUpIndicator">@drawable/ic_drawer</item> <item name="homeAsUpIndicator">@drawable/ic_drawer</item>
<item name="navigation_drawer_background">@color/abs__background_holo_light</item> <item name="navigation_drawer_background">@color/abs__background_holo_light</item>
@ -81,7 +83,9 @@
<item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_dark</item> <item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_dark</item>
</style> </style>
<style name="TextSecure.DarkTheme.NavigationDrawer" parent="@style/TextSecure.DarkTheme"> <style name="TextSecure.DarkTheme.NavigationDrawer"
parent="@style/TextSecure.DarkTheme"
tools:ignore="NewApi">
<item name="android:homeAsUpIndicator">@drawable/ic_drawer</item> <item name="android:homeAsUpIndicator">@drawable/ic_drawer</item>
<item name="homeAsUpIndicator">@drawable/ic_drawer</item> <item name="homeAsUpIndicator">@drawable/ic_drawer</item>
<item name="navigation_drawer_background">#ff333333</item> <item name="navigation_drawer_background">#ff333333</item>
@ -90,7 +94,9 @@
<item name="navigation_drawer_shadow">@drawable/drawer_shadow_dark</item> <item name="navigation_drawer_shadow">@drawable/drawer_shadow_dark</item>
</style> </style>
<style name="TextSecure.Light.Dialog" parent="@android:style/Theme.Dialog"> <style name="TextSecure.Light.Dialog"
parent="@android:style/Theme.Dialog"
tools:ignore="NewApi">
<item name="android:windowFrame">@null</item> <item name="android:windowFrame">@null</item>
<item name="android:windowTitleStyle">@style/TextSecureDialogWindowTitle</item> <item name="android:windowTitleStyle">@style/TextSecureDialogWindowTitle</item>
<item name="android:windowBackground">@drawable/dialog_full_holo_light</item> <item name="android:windowBackground">@drawable/dialog_full_holo_light</item>

2
src/org/thoughtcrime/securesms/util/Util.java
View File

@ -16,6 +16,7 @@
*/ */
package org.thoughtcrime.securesms.util; package org.thoughtcrime.securesms.util;
import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.text.Spannable; import android.text.Spannable;
@ -144,6 +145,7 @@ public class Util {
return baos.toByteArray(); return baos.toByteArray();
} }
@SuppressLint("NewApi")
public static boolean isDefaultSmsProvider(Context context){ public static boolean isDefaultSmsProvider(Context context){
return (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) || return (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) ||
(context.getPackageName().equals(Telephony.Sms.getDefaultSmsPackage(context))); (context.getPackageName().equals(Telephony.Sms.getDefaultSmsPackage(context)));