Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-06 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge in SMS-version UI -- there will not be a separate version for

Browse source 
SMS any more.
This commit is contained in:
Eric House 2012-10-15 08:29:46 -07:00
parent eb47e75c50
commit 077270f1cd
4 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/android/XWords4/AndroidManifest.xml
View file

@ -31,6 +31,10 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.READ_SMS" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" /> <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" />
@ -59,6 +63,11 @@
android:theme="@android:style/Theme.NoTitleBar" android:theme="@android:style/Theme.NoTitleBar"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
/> />
<activity android:name="SMSInviteActivity"
android:theme="@android:style/Theme.Dialog"
android:configChanges="keyboardHidden|orientation"
android:screenOrientation="portrait"
/>
<activity android:name="GameConfig" <activity android:name="GameConfig"
android:screenOrientation="sensor" android:screenOrientation="sensor"
@ -147,5 +156,13 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="SMSReceiver" >
<intent-filter android:priority="999" >
<action android:name="android.provider.Telephony.SMS_RECEIVED" />
</intent-filter>
</receiver>
<service android:name="SMSService"/>
</application> </application>
</manifest> </manifest>

1
xwords4/android/XWords4/jni/Android.mk
View file

@ -14,6 +14,7 @@ local_LDLIBS += -llog
local_DEFINES += \ local_DEFINES += \
$(local_DEBUG) \ $(local_DEBUG) \
-DXWFEATURE_RELAY \ -DXWFEATURE_RELAY \
-DXWFEATURE_SMS \
-DXWFEATURE_COMMSACK \ -DXWFEATURE_COMMSACK \
-DXWFEATURE_TURNCHANGENOTIFY \ -DXWFEATURE_TURNCHANGENOTIFY \
-DXWFEATURE_CHAT \ -DXWFEATURE_CHAT \

10
xwords4/android/XWords4/res/xml/xwprefs.xml
View file

@ -252,6 +252,12 @@
<PreferenceScreen android:title="@string/network_behavior" <PreferenceScreen android:title="@string/network_behavior"
android:summary="@string/network_behavior_summary" android:summary="@string/network_behavior_summary"
> >
<org.eehouse.android.xw4.SMSCheckBoxPreference
android:key="@string/key_enable_sms"
android:title="@string/enable_sms"
android:summary="@string/enable_sms_summary"
android:defaultValue="false"
/>
<org.eehouse.android.xw4.PollListPreference <org.eehouse.android.xw4.PollListPreference
android:key="@string/key_connect_frequency" android:key="@string/key_connect_frequency"
android:title="@string/connect_frequency" android:title="@string/connect_frequency"
@ -288,6 +294,10 @@
android:summary="Menuitems etc." android:summary="Menuitems etc."
android:defaultValue="false" android:defaultValue="false"
/> />
<CheckBoxPreference android:key="@string/key_show_sms"
android:title="Show SMS sends, receives"
android:defaultValue="false"
/>
<org.eehouse.android.xw4.XWEditTextPreference <org.eehouse.android.xw4.XWEditTextPreference
android:key="@string/key_relay_host" android:key="@string/key_relay_host"
android:title="@string/relay_host" android:title="@string/relay_host"

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
View file

@ -30,7 +30,7 @@ import org.eehouse.android.xw4.jni.XwJNI;
public class XWApp extends Application { public class XWApp extends Application {
public static final boolean DEBUG_LOCKS = false; public static final boolean DEBUG_LOCKS = false;
public static final boolean BTSUPPORTED = false; public static final boolean BTSUPPORTED = false;
public static final boolean SMSSUPPORTED = false; public static final boolean SMSSUPPORTED = true;
public static final String SMS_PUBLIC_HEADER = "-XW4"; public static final String SMS_PUBLIC_HEADER = "-XW4";
private static UUID s_UUID = null; private static UUID s_UUID = null;
@ -53,6 +53,8 @@ public class XWApp extends Application {
RelayReceiver.RestartTimer( this ); RelayReceiver.RestartTimer( this );
UpdateCheckReceiver.restartTimer( this ); UpdateCheckReceiver.restartTimer( this );
BTService.startService( this ); BTService.startService( this );
SMSService.checkForInvites( this );
} }
public static UUID getAppUUID() public static UUID getAppUUID()