mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-08 05:24:39 +01:00
remove requirement for gcm.jar
remove from xw4d version too since it can't work anyway.
This commit is contained in:
parent
af81342021
commit
455373343a
5 changed files with 64 additions and 4 deletions
|
@ -197,7 +197,7 @@ android {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Look into replacing this with a fetch too PENDING
|
// Look into replacing this with a fetch too PENDING
|
||||||
compile files('../libs/gcm.jar')
|
xw4Compile files('../libs/gcm.jar')
|
||||||
|
|
||||||
compile 'com.android.support:support-v4:23.4.0'
|
compile 'com.android.support:support-v4:23.4.0'
|
||||||
|
|
||||||
|
|
|
@ -31,8 +31,6 @@ package org.eehouse.android.xw4;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
|
||||||
import com.google.android.gcm.GCMRegistrar;
|
|
||||||
|
|
||||||
public class DevID {
|
public class DevID {
|
||||||
private static final String TAG = DevID.class.getSimpleName();
|
private static final String TAG = DevID.class.getSimpleName();
|
||||||
|
|
||||||
|
@ -137,7 +135,7 @@ public class DevID {
|
||||||
if ( 0 != storedVers && storedVers < curVers ) {
|
if ( 0 != storedVers && storedVers < curVers ) {
|
||||||
result = ""; // Don't trust what registrar has
|
result = ""; // Don't trust what registrar has
|
||||||
} else {
|
} else {
|
||||||
result = GCMRegistrar.getRegistrationId( context );
|
result = GCMStub.getRegistrationId( context );
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
/* -*- compile-command: "find-and-gradle.sh insXw4Deb"; -*- */
|
||||||
|
/*
|
||||||
|
* Copyright 2010 - 2015 by Eric House (xwords@eehouse.org). All rights
|
||||||
|
* reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.eehouse.android.xw4;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import com.google.android.gcm.GCMRegistrar;
|
||||||
|
|
||||||
|
class GCMStub {
|
||||||
|
|
||||||
|
public static String getRegistrationId( Context context )
|
||||||
|
{
|
||||||
|
return GCMRegistrar.getRegistrationId( context );
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,29 @@
|
||||||
|
/* -*- compile-command: "find-and-gradle.sh insXw4dDeb"; -*- */
|
||||||
|
/*
|
||||||
|
* Copyright 2017 by Eric House (xwords@eehouse.org). All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.eehouse.android.xw4;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
class GCMStub {
|
||||||
|
public static String getRegistrationId( Context context )
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1 @@
|
||||||
|
../../../../../../xw4d/java/org/eehouse/android/xw4/GCMStub.java
|
Loading…
Reference in a new issue