From 4f5e66b58c83ac49ee26411c7cf24d0ac757be6d Mon Sep 17 00:00:00 2001
From: Serghei Ceacal <serghei.ceacal@ellation.com>
Date: Thu, 25 Oct 2018 22:43:17 +0300
Subject: [PATCH 1/2] Configure .gitignore

---
 .gitignore  | 5 +++++
 app/app.iml | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 34b89654..6208a99c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,8 @@ local.properties
 proguard/
 # Log Files
 *.log
+pushfish-android.iml
+/pushfish-android.iml
+/app/app.iml
+/pushjet-android.iml
+/Pushjet-Android.iml
diff --git a/app/app.iml b/app/app.iml
index 3086841b..3e6799a1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>

From 760e319adaa7ecea3caf381a2c879828538678b5 Mon Sep 17 00:00:00 2001
From: Serghei Ceacal <serghei.ceacal@ellation.com>
Date: Thu, 25 Oct 2018 22:48:25 +0300
Subject: [PATCH 2/2] Remove GCM from project

---
 Pushjet-Android.iml                           |  19 --
 app/src/main/AndroidManifest.xml              |  12 -
 .../io/Pushfish/api/Async/GCMRegistrar.java   | 210 ------------------
 .../io/Pushfish/api/GcmBroadcastReceiver.java |  19 --
 .../io/Pushfish/api/GcmIntentService.java     | 128 -----------
 .../io/Pushfish/api/SettingsActivity.java     |   6 -
 6 files changed, 394 deletions(-)
 delete mode 100644 Pushjet-Android.iml
 delete mode 100644 app/src/main/java/io/Pushfish/api/Async/GCMRegistrar.java
 delete mode 100644 app/src/main/java/io/Pushfish/api/GcmBroadcastReceiver.java
 delete mode 100644 app/src/main/java/io/Pushfish/api/GcmIntentService.java

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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="Pushjet-Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bf2ef7f1..4245136e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,18 +44,6 @@
                 android:value="io.Pushfish.api.PushListActivity" />
         </activity>
 
-        <receiver
-            android:name="io.Pushfish.api.GcmBroadcastReceiver"
-            android:permission="com.google.android.c2dm.permission.SEND" >
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-
-                <category android:name="io.Pushfish.api" />
-            </intent-filter>
-        </receiver>
-
-        <service android:name="io.Pushfish.api.GcmIntentService" />
-
         <activity
             android:name="io.Pushfish.api.SettingsActivity"
             android:label="@string/title_activity_settings"
diff --git a/app/src/main/java/io/Pushfish/api/Async/GCMRegistrar.java b/app/src/main/java/io/Pushfish/api/Async/GCMRegistrar.java
deleted file mode 100644
index 63f32bd6..00000000
--- a/app/src/main/java/io/Pushfish/api/Async/GCMRegistrar.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package io.Pushfish.api.Async;
-
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.AsyncTask;
-import android.os.Looper;
-import android.preference.PreferenceManager;
-import android.util.Base64;
-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 java.io.IOException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.util.HashMap;
-import java.util.Map;
-
-import io.Pushfish.api.HttpUtil;
-import io.Pushfish.api.PushfishApi.DeviceUuidFactory;
-import io.Pushfish.api.SettingsActivity;
-
-// TODO: Cleanup
-public class GCMRegistrar {
-    public static final String PROPERTY_REG_ID = "registration_id";
-    public static final String PROPERTY_PRIVATE_KEY = "private_key";
-    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);
-    }
-
-    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, "Pushfish is ready for Take-Off!");
-        }
-        return true;
-    }
-
-    private void storeRegistrationId(String regId) {
-        final SharedPreferences prefs = getGcmPreferences(mContext);
-        SharedPreferences.Editor editor = prefs.edit();
-
-        editor.putString(PROPERTY_REG_ID, regId);
-        editor.putInt(PROPERTY_APP_VERSION, getAppVersion());
-        editor.apply();
-    }
-
-    public String getRegistrationId() {
-        final SharedPreferences prefs = getGcmPreferences(mContext);
-        String registrationId = prefs.getString(PROPERTY_REG_ID, "");
-        if (registrationId.isEmpty() || registrationId.equals(""))
-            return "";
-
-        int registeredVersion = prefs.getInt(PROPERTY_APP_VERSION, Integer.MIN_VALUE);
-        if (registeredVersion != getAppVersion())
-            return "";
-        return registrationId;
-    }
-
-    public int getAppVersion() {
-        try {
-            PackageInfo packageInfo = mContext.getPackageManager()
-                    .getPackageInfo(mContext.getPackageName(), 0);
-            return packageInfo.versionCode;
-        } catch (PackageManager.NameNotFoundException e) {
-            throw new RuntimeException("Could not get package name: " + e);
-        }
-    }
-
-    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;
-    }
-
-    public boolean shouldRegister() {
-        return getRegistrationId().equals("");
-    }
-
-    public void forgetRegistration() {
-        SharedPreferences.Editor editor = getGcmPreferences(mContext).edit();
-
-        editor.putString(PROPERTY_REG_ID, "");
-        editor.putInt(PROPERTY_APP_VERSION, Integer.MIN_VALUE);
-        editor.commit();
-    }
-
-    private static boolean asyncAlreadyRunning = false;
-    public class AsyncRegistrar extends AsyncTask<Boolean, Void, Void> {
-
-        @Override
-        protected Void doInBackground(Boolean... params) {
-            if(asyncAlreadyRunning) {
-                return null;
-            }
-
-            asyncAlreadyRunning = true;
-            boolean force = params.length > 0 && params[0];
-            if (!force && shouldRegister()) {
-                Log.i(TAG, "Already registered, no need to re-register");
-                asyncAlreadyRunning = false;
-                return null; // No need to re-register
-            }
-
-            SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
-            String url = SettingsActivity.getRegisterUrl(mContext) + "/gcm";
-            String senderId = SettingsActivity.getSenderId(mContext);
-            Looper.prepare();
-
-            try {
-                if (gcm == null) {
-                    gcm = GoogleCloudMessaging.getInstance(mContext);
-                }
-                String regid = gcm.register(senderId);
-
-                Map<String, String> data = new HashMap<>();
-                data.put("regId", regid);
-                data.put("uuid", new DeviceUuidFactory(mContext).getDeviceUuid().toString());
-
-                // Should we be doing crypto magic?
-                if(preferences.getBoolean("general_encrypt_gcm", true)) {
-                    KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
-                    kpg.initialize(1024, new SecureRandom());
-                    KeyPair kp = kpg.genKeyPair();
-                    PublicKey publicKey = kp.getPublic();
-                    PrivateKey privateKey = kp.getPrivate();
-
-                    String B64DerPublicKey = Base64.encodeToString(publicKey.getEncoded(), Base64.NO_WRAP);
-                    String B64DerPrivateKey = Base64.encodeToString(privateKey.getEncoded(), Base64.NO_WRAP);
-                    data.put("pubkey", B64DerPublicKey);
-
-                    SharedPreferences.Editor editor = getGcmPreferences(mContext).edit();
-                    editor.putString(PROPERTY_PRIVATE_KEY, B64DerPrivateKey);
-                    editor.commit();
-                }
-
-                for (int i = 1; i <= 10; i++) {
-                    Log.i(TAG, "Attempt #" + i + " to register device");
-                    try {
-                        HttpUtil.Post(url, data);
-                        break;
-                    } catch (Exception ignore) {
-                        Log.e(TAG, ignore.getMessage());
-                        if (i == 10)
-                            throw new IOException();
-                        try {
-                            Thread.sleep(2000);
-                        } catch (InterruptedException e) {
-                            Thread.currentThread().interrupt();
-                            break;
-                        }
-                    }
-                }
-
-                storeRegistrationId(regid);
-            } catch (IOException ignore) {
-                Toast.makeText(mContext, "Could not register with GCM server", Toast.LENGTH_SHORT).show();
-            } catch (NoSuchAlgorithmException e) {
-                Toast.makeText(mContext, "Could not build crypto keypair. Disabling encryption...", Toast.LENGTH_LONG).show();
-                SharedPreferences.Editor prefEditor = preferences.edit();
-                prefEditor.putBoolean("general_encrypt_gcm", false);
-                prefEditor.commit();
-
-                return this.doInBackground(params);
-            }
-
-            Log.i(TAG, "Registered!");
-            if (force) {
-                Toast.makeText(mContext, "Registered to " + url, Toast.LENGTH_SHORT).show();
-            }
-
-            Log.i(TAG, "Registered to " + url);
-            asyncAlreadyRunning = false;
-            return null;
-        }
-    }
-}
diff --git a/app/src/main/java/io/Pushfish/api/GcmBroadcastReceiver.java b/app/src/main/java/io/Pushfish/api/GcmBroadcastReceiver.java
deleted file mode 100644
index 674f6df4..00000000
--- a/app/src/main/java/io/Pushfish/api/GcmBroadcastReceiver.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.Pushfish.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/Pushfish/api/GcmIntentService.java b/app/src/main/java/io/Pushfish/api/GcmIntentService.java
deleted file mode 100644
index 98687748..00000000
--- a/app/src/main/java/io/Pushfish/api/GcmIntentService.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package io.Pushfish.api;
-
-import android.annotation.TargetApi;
-import android.app.IntentService;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-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 io.Pushfish.api.PushfishApi.PushfishService;
-import io.Pushfish.api.PushfishApi.PushfishMessage;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.util.Date;
-
-public class GcmIntentService extends IntentService {
-    private static int NOTIFICATION_ID = 0;
-
-    public GcmIntentService() {
-        super("GcmIntentService");
-    }
-
-    @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)) {
-            String rawJson = extras.getString("message");
-
-            try {
-                JSONObject Msg = new JSONObject(rawJson);
-                JSONObject Srv = Msg.getJSONObject("service");
-                PushfishService srv = new PushfishService(
-                        Srv.getString("public"),
-                        Srv.getString("name"),
-                        new Date((long) Srv.getInt("created") * 1000)
-                );
-                srv.setIcon(Srv.getString("icon"));
-
-                PushfishMessage msg = new PushfishMessage(
-                        srv,
-                        Msg.getString("message"),
-                        Msg.getString("title"),
-                        Msg.getInt("timestamp")
-                );
-                msg.setLevel(Msg.getInt("level"));
-                msg.setLink(Msg.getString("link"));
-                DatabaseHandler db = new DatabaseHandler(this);
-                db.addMessage(msg);
-                sendNotification(msg);
-            } catch (JSONException ignore) {
-                Log.e("PushfishJson", ignore.getMessage());
-            }
-        }
-        GcmBroadcastReceiver.completeWakefulIntent(intent);
-        sendBroadcast(new Intent("PushfishMessageRefresh"));
-    }
-
-    private void sendNotification(PushfishMessage msg) {
-        NOTIFICATION_ID++;
-        NotificationManager mNotificationManager = (NotificationManager)
-                this.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        Intent intent = new Intent(this, PushListActivity.class);
-        if (msg.hasLink()) {
-            try {
-                intent = new Intent(Intent.ACTION_VIEW, Uri.parse(msg.getLink()));
-            } catch (Exception ignore) {
-            }
-        }
-        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, 0);
-
-        NotificationCompat.Builder mBuilder =
-                new NotificationCompat.Builder(this)
-                        .setSmallIcon(R.drawable.ic_stat_notif)
-                        .setContentTitle(msg.getTitleOrName())
-                        .setStyle(new NotificationCompat.BigTextStyle()
-                                .bigText(msg.getMessage()))
-                        .setContentText(msg.getMessage())
-                        .setAutoCancel(true);
-
-        if (msg.getService().hasIcon()) {
-            try {
-                Bitmap icon = msg.getService().getIconBitmap(getApplicationContext());
-                Resources res = getApplicationContext().getResources();
-
-                int nHeight = (int) res.getDimension(android.R.dimen.notification_large_icon_height);
-                int nWidth = (int) res.getDimension(android.R.dimen.notification_large_icon_width);
-
-                mBuilder.setLargeIcon(MiscUtil.scaleBitmap(icon, nWidth, nHeight));
-            } catch (IOException ignore) {
-                ignore.printStackTrace();
-            }
-        }
-
-        setPriority(mBuilder, msg);
-        mBuilder.setDefaults(Notification.DEFAULT_ALL);
-
-        mBuilder.setContentIntent(contentIntent);
-        mNotificationManager.notify(NOTIFICATION_ID, mBuilder.build());
-    }
-
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    private void setPriority(NotificationCompat.Builder mBuilder, PushfishMessage msg) {
-        int priority = msg.getLevel() - 3;
-        if(Math.abs(priority) > 2) {
-            priority = 0;
-        }
-
-        mBuilder.setPriority(priority);
-    }
-}
-
diff --git a/app/src/main/java/io/Pushfish/api/SettingsActivity.java b/app/src/main/java/io/Pushfish/api/SettingsActivity.java
index a333614d..6c293459 100644
--- a/app/src/main/java/io/Pushfish/api/SettingsActivity.java
+++ b/app/src/main/java/io/Pushfish/api/SettingsActivity.java
@@ -15,7 +15,6 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 
-import io.Pushfish.api.Async.GCMRegistrar;
 import io.Pushfish.api.Async.RefreshServiceAsync;
 import io.Pushfish.api.PushfishApi.PushfishApi;
 
@@ -71,13 +70,8 @@ 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);
-
                         PushfishApi api = new PushfishApi(context, getRegisterUrl(context));
                         new RefreshServiceAsync(api, db).execute();