From 0abe3534734c520d4b2f223ae549d303f5292f97 Mon Sep 17 00:00:00 2001 From: Andrea Fagiani Date: Sun, 13 Nov 2016 16:02:39 +0100 Subject: [PATCH 1/9] gradle: update gradle scripts to support FCM --- app/build.gradle | 9 +++++---- build.gradle | 3 ++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c81209e3..8a03f8fd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,15 +31,14 @@ repositories { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.google.android.gms:play-services:8.4.0' compile 'com.google.zxing:core:2.2' + compile 'com.google.firebase:firebase-core:9.8.0' + compile 'com.google.firebase:firebase-iid:9.8.0' + compile 'com.google.firebase:firebase-messaging:9.8.0' compile 'com.journeyapps:zxing-android-embedded:2.3.0@aar' compile 'com.journeyapps:zxing-android-integration:2.3.0@aar' compile 'com.android.support:support-v4:24.0.0-alpha2' compile 'com.android.support:appcompat-v7:24.0.0-alpha2' - compile 'com.google.android.gms:play-services-ads:8.4.0' - compile 'com.google.android.gms:play-services-auth:8.4.0' - compile 'com.google.android.gms:play-services-gcm:8.4.0' } allprojects { @@ -49,3 +48,5 @@ allprojects { } } } + +apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3a9dee85..96c90f5a 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.google.gms:google-services:3.0.0' // Lowest version for useLibrary is 1.3.0 // Android Studio will notify you about the latest stable version // See all versions: http://jcenter.bintray.com/com/android/tools/build/gradle/ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 886e8203..aaa47c70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 25 20:37:33 CET 2015 +#Sat Nov 12 18:52:06 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip From 2dee95f47629e44402420156a3724ff9c648cb0e Mon Sep 17 00:00:00 2001 From: Andrea Fagiani Date: Sun, 13 Nov 2016 16:05:35 +0100 Subject: [PATCH 2/9] io.Pushjet.api: introduce new services to support FCM, remove BroadcastReceiver, refactoring --- ...r.java => PushjetRegistrationService.java} | 111 +++++++++++------- .../io/Pushjet/api/GcmBroadcastReceiver.java | 19 --- ...ce.java => PushjetFcmListenerService.java} | 73 +++++------- .../api/PushjetFirebaseInstanceIDService.java | 26 ++++ 4 files changed, 124 insertions(+), 105 deletions(-) rename app/src/main/java/io/Pushjet/api/Async/{GCMRegistrar.java => PushjetRegistrationService.java} (72%) delete mode 100644 app/src/main/java/io/Pushjet/api/GcmBroadcastReceiver.java rename app/src/main/java/io/Pushjet/api/{GcmIntentService.java => PushjetFcmListenerService.java} (61%) create mode 100644 app/src/main/java/io/Pushjet/api/PushjetFirebaseInstanceIDService.java diff --git a/app/src/main/java/io/Pushjet/api/Async/GCMRegistrar.java b/app/src/main/java/io/Pushjet/api/Async/PushjetRegistrationService.java similarity index 72% rename from app/src/main/java/io/Pushjet/api/Async/GCMRegistrar.java rename to app/src/main/java/io/Pushjet/api/Async/PushjetRegistrationService.java index 96cdddc0..7a3db829 100644 --- a/app/src/main/java/io/Pushjet/api/Async/GCMRegistrar.java +++ b/app/src/main/java/io/Pushjet/api/Async/PushjetRegistrationService.java @@ -1,54 +1,73 @@ package io.Pushjet.api.Async; +import android.app.Service; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.AsyncTask; +import android.os.Binder; +import android.os.IBinder; import android.os.Looper; +import android.support.annotation.Nullable; import android.util.Log; import android.widget.Toast; -import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.GooglePlayServicesUtil; -import com.google.android.gms.gcm.GoogleCloudMessaging; - import io.Pushjet.api.HttpUtil; import io.Pushjet.api.PushjetApi.DeviceUuidFactory; +import io.Pushjet.api.PushjetFirebaseInstanceIDService; import io.Pushjet.api.SettingsActivity; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.Set; -public class GCMRegistrar { +public class PushjetRegistrationService extends Service { public static final String PROPERTY_REG_ID = "registration_id"; + public static final String PROPERTY_UNREGISTER = "unregister"; + public static final String PROPERTY_FCM_TOKEN = "fcm_token"; private static final String PROPERTY_APP_VERSION = "app_version"; - private static final int PLAY_SERVICES_RESOLUTION_REQUEST = 9000; - protected String TAG = "GCM"; - private GoogleCloudMessaging gcm; - private Context mContext; - - public GCMRegistrar(Context context) { - this.mContext = context; - gcm = GoogleCloudMessaging.getInstance(context); - } + protected String TAG = "PushjetRegSvc"; + private Context mContext = this; + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + Set keySet = intent.getExtras().keySet(); + Boolean force = false; + + Log.d(TAG, "onStartCommand"); + if (keySet.contains(PROPERTY_UNREGISTER)) { + forgetRegistration(); + force = true; + } - public boolean checkPlayServices(android.app.Activity self) { - int resultCode = GooglePlayServicesUtil.isGooglePlayServicesAvailable(mContext); - if (resultCode != ConnectionResult.SUCCESS) { - Log.e(TAG, "This device does not support GCM"); - if (GooglePlayServicesUtil.isUserRecoverableError(resultCode) && self != null) { - GooglePlayServicesUtil.getErrorDialog(resultCode, self, PLAY_SERVICES_RESOLUTION_REQUEST).show(); - } else { - Toast.makeText(mContext, "Sorry, you need to have the Google Play services installed :<", Toast.LENGTH_SHORT).show(); - } - return false; - } else { - Log.i(TAG, "Pushjet is ready for Take-Off!"); + if (keySet.contains(PROPERTY_FCM_TOKEN)) { + String regId = String.valueOf(intent.getStringExtra(PROPERTY_FCM_TOKEN)); + storeToken(regId); + Log.d(TAG, "Token Registered."); } - return true; + + registerInBackground(force); + + return START_STICKY; + } + + @Nullable + @Override + public IBinder onBind(Intent intent) { + return null; + } + + + private void storeToken(String token) { + final SharedPreferences prefs = getGcmPreferences(mContext); + SharedPreferences.Editor editor = prefs.edit(); + + editor.putString(PROPERTY_FCM_TOKEN, token); + editor.apply(); } private void storeRegistrationId(String regId) { @@ -72,6 +91,10 @@ public String getRegistrationId() { return registrationId; } + private String getToken() { + return getGcmPreferences(mContext).getString(PROPERTY_FCM_TOKEN, ""); + } + public int getAppVersion() { try { PackageInfo packageInfo = mContext.getPackageManager() @@ -83,17 +106,7 @@ public int getAppVersion() { } private SharedPreferences getGcmPreferences(Context context) { - return context.getSharedPreferences(GCMRegistrar.class.getSimpleName(), Context.MODE_PRIVATE); - } - - public AsyncRegistrar registerInBackground() { - return this.registerInBackground(false); - } - - public AsyncRegistrar registerInBackground(boolean force) { - AsyncRegistrar task = new AsyncRegistrar(); - task.execute(force); - return task; + return context.getSharedPreferences(PushjetFirebaseInstanceIDService.class.getSimpleName(), Context.MODE_PRIVATE); } public boolean shouldRegister() { @@ -103,12 +116,21 @@ public boolean shouldRegister() { public void forgetRegistration() { final SharedPreferences prefs = getGcmPreferences(mContext); SharedPreferences.Editor editor = prefs.edit(); - - editor.putString(PROPERTY_REG_ID, ""); - editor.putInt(PROPERTY_APP_VERSION, Integer.MIN_VALUE); + editor.remove(PROPERTY_REG_ID); + editor.remove(PROPERTY_APP_VERSION); editor.commit(); } + public AsyncRegistrar registerInBackground() { + return this.registerInBackground(false); + } + + public AsyncRegistrar registerInBackground(boolean force) { + AsyncRegistrar task = new AsyncRegistrar(); + task.execute(force); + return task; + } + private static boolean asyncAlreadyRunning = false; public class AsyncRegistrar extends AsyncTask { @@ -131,10 +153,7 @@ protected Void doInBackground(Boolean... params) { Looper.prepare(); try { - if (gcm == null) { - gcm = GoogleCloudMessaging.getInstance(mContext); - } - String regid = gcm.register(senderId); + String regid = getToken(); Map data = new HashMap(); data.put("regId", regid); @@ -172,3 +191,5 @@ protected Void doInBackground(Boolean... params) { } } } + + diff --git a/app/src/main/java/io/Pushjet/api/GcmBroadcastReceiver.java b/app/src/main/java/io/Pushjet/api/GcmBroadcastReceiver.java deleted file mode 100644 index 253f3015..00000000 --- a/app/src/main/java/io/Pushjet/api/GcmBroadcastReceiver.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.Pushjet.api; - -import android.app.Activity; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.support.v4.content.WakefulBroadcastReceiver; - -public class GcmBroadcastReceiver extends WakefulBroadcastReceiver { - - @Override - public void onReceive(Context context, Intent intent) { - // Explicitly specify that GcmIntentService will handle the intent. - ComponentName comp = new ComponentName(context.getPackageName(), GcmIntentService.class.getName()); - // Start the service, keeping the device awake while it is launching. - startWakefulService(context, (intent.setComponent(comp))); - setResultCode(Activity.RESULT_OK); - } -} \ No newline at end of file diff --git a/app/src/main/java/io/Pushjet/api/GcmIntentService.java b/app/src/main/java/io/Pushjet/api/PushjetFcmListenerService.java similarity index 61% rename from app/src/main/java/io/Pushjet/api/GcmIntentService.java rename to app/src/main/java/io/Pushjet/api/PushjetFcmListenerService.java index cfc99f95..20cb2859 100644 --- a/app/src/main/java/io/Pushjet/api/GcmIntentService.java +++ b/app/src/main/java/io/Pushjet/api/PushjetFcmListenerService.java @@ -2,7 +2,6 @@ import android.annotation.TargetApi; -import android.app.IntentService; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -12,11 +11,11 @@ import android.graphics.Bitmap; import android.net.Uri; import android.os.Build; -import android.os.Bundle; import android.support.v4.app.NotificationCompat; import android.util.Log; -import com.google.android.gms.gcm.GoogleCloudMessaging; +import com.google.firebase.messaging.FirebaseMessagingService; +import com.google.firebase.messaging.RemoteMessage; import io.Pushjet.api.PushjetApi.PushjetMessage; import io.Pushjet.api.PushjetApi.PushjetService; @@ -26,48 +25,41 @@ import java.io.IOException; import java.util.Date; +import java.util.Map; -public class GcmIntentService extends IntentService { +public class PushjetFcmListenerService extends FirebaseMessagingService { private static int NOTIFICATION_ID = 0; - - public GcmIntentService() { - super("GcmIntentService"); - } + private static final String TAG = "PushjetGcmListeners"; @Override - protected void onHandleIntent(Intent intent) { - Bundle extras = intent.getExtras(); - GoogleCloudMessaging gcm = GoogleCloudMessaging.getInstance(this); - String messageType = gcm.getMessageType(intent); - - if (!extras.isEmpty() && GoogleCloudMessaging.MESSAGE_TYPE_MESSAGE.equals(messageType)) { - try { - JSONObject AzMsg = new JSONObject(extras.getString("message")); - JSONObject AzServ = AzMsg.getJSONObject("service"); - PushjetService srv = new PushjetService( - AzServ.getString("public"), - AzServ.getString("name"), - new Date((long) AzServ.getInt("created") * 1000) - ); - srv.setIcon(AzServ.getString("icon")); - - PushjetMessage msg = new PushjetMessage( - srv, - AzMsg.getString("message"), - AzMsg.getString("title"), - AzMsg.getInt("timestamp") - ); - msg.setLevel(AzMsg.getInt("level")); - msg.setLink(AzMsg.getString("link")); - DatabaseHandler db = new DatabaseHandler(this); - db.addMessage(msg); - sendNotification(msg); - } catch (JSONException ignore) { - Log.e("PushjetJson", ignore.getMessage()); - } + public void onMessageReceived(RemoteMessage message) { + String from = message.getFrom(); + Map data = message.getData(); + Log.d(TAG, "Message from: " + from); + try { + JSONObject AzMsg = new JSONObject((String)data.get("message")); + JSONObject AzServ = AzMsg.getJSONObject("service"); + PushjetService srv = new PushjetService( + AzServ.getString("public"), + AzServ.getString("name"), + new Date((long) AzServ.getInt("created") * 1000) + ); + srv.setIcon(AzServ.getString("icon")); + + PushjetMessage msg = new PushjetMessage( + srv, + AzMsg.getString("message"), + AzMsg.getString("title"), + AzMsg.getInt("timestamp") + ); + msg.setLevel(AzMsg.getInt("level")); + msg.setLink(AzMsg.getString("link")); + DatabaseHandler db = new DatabaseHandler(this); + db.addMessage(msg); + sendNotification(msg); + } catch (JSONException ignore) { + Log.e("PushjetJson", ignore.getMessage()); } - GcmBroadcastReceiver.completeWakefulIntent(intent); - sendBroadcast(new Intent("PushjetMessageRefresh")); } private void sendNotification(PushjetMessage msg) { @@ -124,4 +116,3 @@ private void setPriority(NotificationCompat.Builder mBuilder, PushjetMessage msg mBuilder.setPriority(priority); } } - diff --git a/app/src/main/java/io/Pushjet/api/PushjetFirebaseInstanceIDService.java b/app/src/main/java/io/Pushjet/api/PushjetFirebaseInstanceIDService.java new file mode 100644 index 00000000..806b02a7 --- /dev/null +++ b/app/src/main/java/io/Pushjet/api/PushjetFirebaseInstanceIDService.java @@ -0,0 +1,26 @@ +package io.Pushjet.api; + + +import android.content.Intent; +import android.util.Log; + +import com.google.firebase.iid.FirebaseInstanceId; +import com.google.firebase.iid.FirebaseInstanceIdService; + +import io.Pushjet.api.Async.PushjetRegistrationService; + +public class PushjetFirebaseInstanceIDService extends FirebaseInstanceIdService { + protected final String TAG = "PushjetFCMIIDService"; + + @Override + public void onTokenRefresh() { + // Get updated InstanceID token. + String refreshedToken = FirebaseInstanceId.getInstance().getToken(); + Log.d(TAG, "Refreshed token: " + refreshedToken); + + // call PushjetRegistrationService to update the token + Intent intent = new Intent(this, PushjetRegistrationService.class); + intent.putExtra(PushjetRegistrationService.PROPERTY_FCM_TOKEN, refreshedToken); + startService(intent); + } +} From c35c59d534834e8af30beaa3e519a4a06a481890 Mon Sep 17 00:00:00 2001 From: Andrea Fagiani Date: Sun, 13 Nov 2016 16:06:03 +0100 Subject: [PATCH 3/9] AndroidManifest: FCM updates --- app/src/main/AndroidManifest.xml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2ac3e6c6..7b5ae60e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,14 +4,9 @@ - - - - - - + - + + + - + + + - + - + + + + + Date: Sun, 13 Nov 2016 16:09:07 +0100 Subject: [PATCH 4/9] Pushjet: update activities to work with the new services --- .../main/java/io/Pushjet/api/PushListActivity.java | 11 ----------- .../main/java/io/Pushjet/api/SettingsActivity.java | 11 ++++++----- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/io/Pushjet/api/PushListActivity.java b/app/src/main/java/io/Pushjet/api/PushListActivity.java index 5d9b14da..1ba1aad0 100644 --- a/app/src/main/java/io/Pushjet/api/PushListActivity.java +++ b/app/src/main/java/io/Pushjet/api/PushListActivity.java @@ -17,7 +17,6 @@ import android.widget.Toast; import io.Pushjet.api.Async.FirstLaunchAsync; -import io.Pushjet.api.Async.GCMRegistrar; import io.Pushjet.api.Async.ReceivePushAsync; import io.Pushjet.api.Async.ReceivePushCallback; import io.Pushjet.api.PushjetApi.PushjetApi; @@ -83,16 +82,6 @@ public boolean onItemLongClick(AdapterView parent, View v, int position, long } }); - - GCMRegistrar mGCMRegistrar = new GCMRegistrar(getApplicationContext()); - if (firstLaunch || mGCMRegistrar.shouldRegister()) { - if (mGCMRegistrar.checkPlayServices(this)) { - mGCMRegistrar.registerInBackground(firstLaunch); - } else { - finish(); - } - } - receiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { diff --git a/app/src/main/java/io/Pushjet/api/SettingsActivity.java b/app/src/main/java/io/Pushjet/api/SettingsActivity.java index 15f02bc4..e8d686f7 100644 --- a/app/src/main/java/io/Pushjet/api/SettingsActivity.java +++ b/app/src/main/java/io/Pushjet/api/SettingsActivity.java @@ -4,6 +4,7 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; import android.os.Build; @@ -15,7 +16,7 @@ import android.preference.PreferenceFragment; import android.preference.PreferenceManager; -import io.Pushjet.api.Async.GCMRegistrar; +import io.Pushjet.api.Async.PushjetRegistrationService; import io.Pushjet.api.Async.RefreshServiceAsync; import io.Pushjet.api.PushjetApi.PushjetApi; @@ -71,12 +72,12 @@ public void onClick(DialogInterface dialog, int which) { builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - GCMRegistrar gcm = new GCMRegistrar(context); - - gcm.forgetRegistration(); db.truncateMessages(); db.truncateServices(); - gcm.registerInBackground(true); + + Intent intent = new Intent(context, PushjetRegistrationService.class); + intent.putExtra(PushjetRegistrationService.PROPERTY_UNREGISTER, ""); + context.startService(intent); PushjetApi api = new PushjetApi(context, getRegisterUrl(context)); new RefreshServiceAsync(api, db).execute(); From 77960a7cf332a0caae23481b52053c42e90d95b2 Mon Sep 17 00:00:00 2001 From: Andrea Fagiani Date: Sun, 13 Nov 2016 16:11:29 +0100 Subject: [PATCH 5/9] app: add placeholder google-services.json, *MUST* be replaced with the one obtained from https://firebase.google.com/console/ --- app/google-services.json | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 app/google-services.json diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 00000000..51e0340b --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,42 @@ +{ + "project_info": { + "project_number": "", + "firebase_url": "", + "project_id": "", + "storage_bucket": "" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "", + "android_client_info": { + "package_name": "io.Pushjet.api" + } + }, + "oauth_client": [ + { + "client_id": "", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 1, + "other_platform_oauth_client": [] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} From 8b0cbdba3ec48f91fe506c338a59e59c585b8698 Mon Sep 17 00:00:00 2001 From: Andrea Fagiani Date: Sun, 13 Nov 2016 16:35:54 +0100 Subject: [PATCH 6/9] Pushjet: less Log statements --- .../java/io/Pushjet/api/Async/PushjetRegistrationService.java | 2 -- app/src/main/java/io/Pushjet/api/PushjetFcmListenerService.java | 1 - .../java/io/Pushjet/api/PushjetFirebaseInstanceIDService.java | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/io/Pushjet/api/Async/PushjetRegistrationService.java b/app/src/main/java/io/Pushjet/api/Async/PushjetRegistrationService.java index 7a3db829..bd582991 100644 --- a/app/src/main/java/io/Pushjet/api/Async/PushjetRegistrationService.java +++ b/app/src/main/java/io/Pushjet/api/Async/PushjetRegistrationService.java @@ -38,7 +38,6 @@ public int onStartCommand(Intent intent, int flags, int startId) { Set keySet = intent.getExtras().keySet(); Boolean force = false; - Log.d(TAG, "onStartCommand"); if (keySet.contains(PROPERTY_UNREGISTER)) { forgetRegistration(); force = true; @@ -47,7 +46,6 @@ public int onStartCommand(Intent intent, int flags, int startId) { if (keySet.contains(PROPERTY_FCM_TOKEN)) { String regId = String.valueOf(intent.getStringExtra(PROPERTY_FCM_TOKEN)); storeToken(regId); - Log.d(TAG, "Token Registered."); } registerInBackground(force); diff --git a/app/src/main/java/io/Pushjet/api/PushjetFcmListenerService.java b/app/src/main/java/io/Pushjet/api/PushjetFcmListenerService.java index 20cb2859..6f3e9a2c 100644 --- a/app/src/main/java/io/Pushjet/api/PushjetFcmListenerService.java +++ b/app/src/main/java/io/Pushjet/api/PushjetFcmListenerService.java @@ -35,7 +35,6 @@ public class PushjetFcmListenerService extends FirebaseMessagingService { public void onMessageReceived(RemoteMessage message) { String from = message.getFrom(); Map data = message.getData(); - Log.d(TAG, "Message from: " + from); try { JSONObject AzMsg = new JSONObject((String)data.get("message")); JSONObject AzServ = AzMsg.getJSONObject("service"); diff --git a/app/src/main/java/io/Pushjet/api/PushjetFirebaseInstanceIDService.java b/app/src/main/java/io/Pushjet/api/PushjetFirebaseInstanceIDService.java index 806b02a7..6f367e79 100644 --- a/app/src/main/java/io/Pushjet/api/PushjetFirebaseInstanceIDService.java +++ b/app/src/main/java/io/Pushjet/api/PushjetFirebaseInstanceIDService.java @@ -16,7 +16,7 @@ public class PushjetFirebaseInstanceIDService extends FirebaseInstanceIdService public void onTokenRefresh() { // Get updated InstanceID token. String refreshedToken = FirebaseInstanceId.getInstance().getToken(); - Log.d(TAG, "Refreshed token: " + refreshedToken); + Log.d(TAG, "FCM Token refreshed."); // call PushjetRegistrationService to update the token Intent intent = new Intent(this, PushjetRegistrationService.class); From ea7b2a63bb871332545efd325e06620ff98d9594 Mon Sep 17 00:00:00 2001 From: Andrea Fagiani Date: Sun, 13 Nov 2016 16:47:03 +0100 Subject: [PATCH 7/9] add .iml files to gitignore --- .gitignore | 2 + Pushjet-Android.iml | 19 ------ app/app.iml | 163 -------------------------------------------- pushjet-android.iml | 19 ------ 4 files changed, 2 insertions(+), 201 deletions(-) delete mode 100644 Pushjet-Android.iml delete mode 100644 app/app.iml delete mode 100644 pushjet-android.iml diff --git a/.gitignore b/.gitignore index 34b89654..cb70d220 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ local.properties proguard/ # Log Files *.log +# IntelliJ files +*.iml diff --git a/Pushjet-Android.iml b/Pushjet-Android.iml deleted file mode 100644 index b3109a9e..00000000 --- a/Pushjet-Android.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index 29287d18..00000000 --- a/app/app.iml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pushjet-android.iml b/pushjet-android.iml deleted file mode 100644 index 78ea65c1..00000000 --- a/pushjet-android.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file From 7c79ba100a11b5e16adb8e686a8830037b51a20a Mon Sep 17 00:00:00 2001 From: Andrea Fagiani Date: Sun, 13 Nov 2016 17:01:07 +0100 Subject: [PATCH 8/9] circle.yml: use jdk8 --- circle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/circle.yml b/circle.yml index 3aa123c1..0ddfec36 100644 --- a/circle.yml +++ b/circle.yml @@ -5,3 +5,7 @@ test: general: artifacts: - "app/build/outputs/apk/app-debug.apk" # Installable APK that users can install live on the bleeding edge + +machine: + java: + version: 'oraclejdk8' From aaf2490ba997d86fa6b225eb80f0688bf9a1e205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=20H=C3=A4hnel?= Date: Sat, 27 Aug 2016 12:45:33 +0200 Subject: [PATCH 9/9] Fix CircleCI build --- circle.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/circle.yml b/circle.yml index 0ddfec36..19ff33bd 100644 --- a/circle.yml +++ b/circle.yml @@ -1,3 +1,8 @@ +dependencies: + pre: + - echo y | android update sdk -u -a -t tool + - echo y | android update sdk --no-ui --all --filter "android-23,build-tools-23.0.3" + test: override: - ./gradlew clean assembleDebug --recompile-scripts --refresh-dependencies --parallel --stacktrace