use sse for push notification, #386

tutao · Jun 14, 2018 · 449c36eac5755571f4c5d28a74dfdc13c3cdc6df · 449c36e · MartinHennrich · Jun 16, 2018
1 parent 6ac0270
commit 449c36eac5755571f4c5d28a74dfdc13c3cdc6df
diff --git a/app-android/app/build.gradle b/app-android/app/build.gradle
@@ -51,9 +51,11 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation "com.google.android.gms:play-services-gcm:10.2.1"
     implementation 'commons-io:commons-io:2.4'
     implementation 'org.jdeferred:jdeferred-core:1.2.4'
+    implementation 'com.android.support:support-compat:27.1.1'
+    implementation 'com.android.support:support-core-utils:27.1.1'
+
     testImplementation 'junit:junit:4.12'
     testImplementation "org.robolectric:robolectric:3.3.2"
     androidTestImplementation 'org.codehaus.jackson:jackson-mapper-asl:1.9.2'
diff --git a/app-android/app/src/main/AndroidManifest.xml b/app-android/app/src/main/AndroidManifest.xml
@@ -1,71 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.tutao.tutanota">
+          package="de.tutao.tutanota">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+            android:allowBackup="false"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:supportsRtl="true"
+            android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
-            android:launchMode="singleInstance"
-            android:theme="@style/SplashTheme">
+                android:name=".MainActivity"
+                android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
+                android:launchMode="singleInstance"
+                android:theme="@style/SplashTheme">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <action android:name="android.intent.action.SEND"/>
+                <action android:name="android.intent.action.SEND_MULTIPLE"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="*/*" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="*/*"/>
             </intent-filter>
         </activity>
         <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="${contentProviderAuthority}"
-            android:exported="false"
-            android:grantUriPermissions="true">
+                android:name="android.support.v4.content.FileProvider"
+                android:authorities="${contentProviderAuthority}"
+                android:exported="false"
+                android:grantUriPermissions="true">
             <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/paths" />
+                    android:name="android.support.FILE_PROVIDER_PATHS"
+                    android:resource="@xml/paths"/>
         </provider>
-        <receiver
-            android:name="com.google.android.gms.gcm.GcmReceiver"
-            android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-                <category android:name="com.example.gcm" />
-            </intent-filter>
-        </receiver>
 
         <service
-            android:name="de.tutao.tutanota.push.GcmListener"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="de.tutao.tutanota.push.PushInstanceIdListenerService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.android.gms.iid.InstanceID" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="de.tutao.tutanota.push.GcmRegistrationService"
-            android:exported="false" />
+                android:name=".push.PushNotificationService"
+                android:enabled="true"
+                android:exported="false"
+                android:process=":pushprocess"/>
     </application>
 
 </manifest>
diff --git a/app-android/app/src/main/java/de/tutao/tutanota/Crypto.java b/app-android/app/src/main/java/de/tutao/tutanota/Crypto.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
-import android.util.Log;
 
 import org.apache.commons.io.IOUtils;
 import org.json.JSONException;
@@ -59,15 +58,15 @@
 
     private static final Integer ANDROID_6_SDK_VERSION = 23;
 
-    private final MainActivity activity;
+    private final Context context;
 
     static {
         // see: http://android-developers.blogspot.de/2013/08/some-securerandom-thoughts.html
         PRNGFixes.apply();
     }
 
-    public Crypto(MainActivity activity) {
-        this.activity = activity;
+    public Crypto(Context context) {
+        this.context = context;
         this.randomizer = new SecureRandom();
     }
 
@@ -176,7 +175,6 @@ public static SecretKeySpec bytesToKey(byte[] key) {
     }
 
     String aesEncryptFile(final byte[] key, final String fileUrl, final byte[] iv) throws IOException, InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidAlgorithmParameterException {
-        Context context = activity.getWebView().getContext();
         File inputFile = Utils.uriToFile(context, fileUrl);
         File encryptedDir = new File(Utils.getDir(context), TEMP_DIR_ENCRYPTED);
         encryptedDir.mkdirs();
@@ -213,7 +211,6 @@ private String aesDecrypt(final byte[] key, final byte[] cipherText) throws Inva
     }
 
     String aesDecryptFile(final byte[] key, final String fileUrl) throws IOException, InvalidKeyException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, NoSuchPaddingException {
-        Context context = activity.getWebView().getContext();
         File inputFile = Utils.uriToFile(context, fileUrl);
         File decryptedDir = new File(Utils.getDir(context), TEMP_DIR_DECRYPTED);
         decryptedDir.mkdirs();
@@ -244,6 +241,10 @@ public void aesDecrypt(final byte[] key, InputStream in, OutputStream out) throw
         }
     }
 
+    public SecureRandom getRandomizer() {
+        return randomizer;
+    }
+
     private InputStream getCipherInputStream(InputStream in, Cipher cipher) {
         if (Build.VERSION.SDK_INT < ANDROID_6_SDK_VERSION) {
             // Use the tutao cipher suite implementation to increase download performance.
diff --git a/app-android/app/src/main/java/de/tutao/tutanota/MainActivity.java b/app-android/app/src/main/java/de/tutao/tutanota/MainActivity.java
@@ -18,9 +18,6 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-
 import org.jdeferred.Deferred;
 import org.jdeferred.DoneCallback;
 import org.jdeferred.Promise;
@@ -31,7 +28,7 @@
 import java.io.FileNotFoundException;
 import java.util.HashMap;
 
-import de.tutao.tutanota.push.GcmRegistrationService;
+import de.tutao.tutanota.push.PushNotificationService;
 
 public class MainActivity extends Activity {
 
@@ -48,6 +45,8 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        this.setupPushNotifications();
+
         webView = new WebView(this);
         webView.setBackgroundColor(getResources().getColor(android.R.color.transparent));
         setContentView(webView);
@@ -85,7 +84,6 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         });
         this.webView.loadUrl(appUrl);
         nativeImpl.setup();
-
     }
 
     @Override
@@ -157,23 +155,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     void setupPushNotifications() {
-        if (gcmIsAvailable()) {
-            // gcm registration
-            Intent intent = new Intent(MainActivity.this, GcmRegistrationService.class);
-            startService(intent);
-        }
-    }
-
-    /**
-     * @return true, if the GCM is available.
-     */
-    private boolean gcmIsAvailable() {
-        GoogleApiAvailability apiAvailability = GoogleApiAvailability.getInstance();
-        int resultCode = apiAvailability.isGooglePlayServicesAvailable(this);
-        if (resultCode != ConnectionResult.SUCCESS) {
-            return false;
-        }
-        return true;
+        startService(new Intent(this, PushNotificationService.class));
     }
 
     public void bringToForeground() {
diff --git a/app-android/app/src/main/java/de/tutao/tutanota/Native.java b/app-android/app/src/main/java/de/tutao/tutanota/Native.java
@@ -23,6 +23,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import de.tutao.tutanota.push.SseStorage;
+
 /**
  * Created by mpfau on 4/8/17.
  */
@@ -34,6 +36,7 @@
     Crypto crypto;
     FileUtil files;
     Contact contact;
+    SseStorage sseStorage;
     Map<String, DeferredObject<JSONObject, Exception, ?>> queue = new HashMap<>();
     private final MainActivity activity;
     private volatile DeferredObject<Void, Void, Void> webAppInitialized = new DeferredObject<>();
@@ -44,6 +47,7 @@
         crypto = new Crypto(activity);
         contact = new Contact(activity);
         files = new FileUtil(activity);
+        sseStorage = new SseStorage(activity);
     }
 
     public void setup() {
@@ -219,6 +223,14 @@ private Promise invokeMethod(String method, JSONArray args) {
                 case "openLink":
                     promise.resolve(openLink(args.getString(0)));
                     break;
+                case "getPushIdentifier":
+                    promise.resolve(sseStorage.getPushIdentifier());
+                    break;
+                case "storePushIdentifierLocally":
+                    sseStorage.storePushIdentifier(args.getString(0), args.getString(1),
+                            args.getString(2));
+                    promise.resolve(true);
+                    break;
                 default:
                     throw new Exception("unsupported method: " + method);
             }
diff --git a/app-android/app/src/main/java/de/tutao/tutanota/Utils.java b/app-android/app/src/main/java/de/tutao/tutanota/Utils.java
@@ -26,6 +26,11 @@ public static String bytesToBase64(byte[] bytes) {
 		return Base64.decode(base64, Base64.NO_WRAP);
 	}
 
+	public static String  base64ToBase64Url(String base64) {
+		return base64.replaceAll("\\+", "-")
+				.replaceAll("/", "_")
+				.replaceAll("=", "");
+	}
 
 
 
diff --git a/app-android/app/src/main/java/de/tutao/tutanota/push/GcmListener.java b/app-android/app/src/main/java/de/tutao/tutanota/push/GcmListener.java
@@ -1,21 +0,0 @@
-package de.tutao.tutanota.push;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Vibrator;
-
-import com.google.android.gms.gcm.GcmListenerService;
-
-/**
- * Created by mpfau on 4/16/17.
- */
-
-public class GcmListener extends GcmListenerService {
-
-    @Override
-    public void onMessageReceived(String s, Bundle data) {
-        super.onMessageReceived(s, data);
-        Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
-        v.vibrate(300);
-    }
-}
diff --git a/app-android/app/src/main/java/de/tutao/tutanota/push/GcmRegistrationService.java b/app-android/app/src/main/java/de/tutao/tutanota/push/GcmRegistrationService.java
@@ -1,47 +0,0 @@
-package de.tutao.tutanota.push;
-
-import android.app.IntentService;
-import android.content.Intent;
-import android.support.annotation.Nullable;
-import android.util.Log;
-
-import com.google.android.gms.gcm.GoogleCloudMessaging;
-import com.google.android.gms.iid.InstanceID;
-
-import org.jdeferred.FailCallback;
-
-import java.io.IOException;
-
-import de.tutao.tutanota.JsRequest;
-
-
-/**
- * Created by mpfau on 4/16/17.
- */
-public class GcmRegistrationService extends IntentService {
-    static String SenderId = "707517914653";
-    static String TAG = "GcmRegistrationService";
-
-    public GcmRegistrationService() {
-        super("GcmRegistrationService");
-    }
-
-    @Override
-    protected void onHandleIntent(@Nullable Intent intent) {
-//        InstanceID instanceID = InstanceID.getInstance(this);
-//        try {
-//            String token = instanceID.getToken(SenderId,
-//                    GoogleCloudMessaging.INSTANCE_ID_SCOPE, null);
-//            activity.nativeImpl.sendRequest(JsRequest.updatePushIdentifier, new Object[] { token }).fail(new FailCallback<Exception>() {
-//                @Override
-//                public void onFail(Exception e) {
-//                    Log.e(TAG, "could not retrieve token", e);
-//                }
-//            });
-//        } catch (IOException e) {
-//            Log.e(TAG, "could not retrieve token", e);
-//        }
-    }
-
-
-}
diff --git a/app-android/app/src/main/java/de/tutao/tutanota/push/PushInstanceIdListenerService.java b/app-android/app/src/main/java/de/tutao/tutanota/push/PushInstanceIdListenerService.java
@@ -1,17 +0,0 @@
-package de.tutao.tutanota.push;
-
-import android.content.Intent;
-
-import com.google.android.gms.iid.InstanceIDListenerService;
-
-/**
- * Created by mpfau on 4/16/17.
- */
-
-public class PushInstanceIdListenerService extends InstanceIDListenerService {
-    @Override
-    public void onTokenRefresh() {
-        Intent intent = new Intent(this, GcmRegistrationService.class);
-        startService(intent);
-    }
-}