Commit b3045f7c authored by armin's avatar armin
Browse files

Merge branch 'master' into 'production'

v1.1.3

See merge request !30
parents 818587fd 93ebfab4
This diff is collapsed.
Subproject commit 5c86fb9d30cae50f39626a12a5d9ef0316e7df50
Subproject commit fbe3688fafa48684390480209d112529d4c02787
/********************************************************************************************
* *
* Copyright (C) 2017 Armin Felder, Dennis Beier *
* This file is part of RocketChatMobileEngine <https://git.fairkom.net/chat/fairchat>. *
* *
* RocketChatMobileEngine 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 3 of the License, or *
* (at your option) any later version. *
* *
* RocketChatMobileEngine 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 RocketChatMobileEngine. If not, see <http://www.gnu.org/licenses/>. *
* *
********************************************************************************************/
package com.osalliance.rocketchatMobile;
import android.app.Notification;
......@@ -22,10 +43,6 @@ import me.leolin.shortcutbadger.ShortcutBadger;
import static android.app.Notification.DEFAULT_ALL;
/**
* Created by armin on 19.04.17.
*/
public class FcmMessageReceiver extends FirebaseMessagingService {
public static final int NOTIFICATION_ID = 1;
......
/********************************************************************************************
* *
* Copyright (C) 2017 Armin Felder, Dennis Beier *
* This file is part of RocketChatMobileEngine <https://git.fairkom.net/chat/fairchat>. *
* *
* RocketChatMobileEngine 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 3 of the License, or *
* (at your option) any later version. *
* *
* RocketChatMobileEngine 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 RocketChatMobileEngine. If not, see <http://www.gnu.org/licenses/>. *
* *
********************************************************************************************/
package com.osalliance.rocketchatMobile;
import android.util.Log;
......@@ -5,9 +26,6 @@ import android.util.Log;
import com.google.firebase.iid.FirebaseInstanceId;
import com.google.firebase.iid.FirebaseInstanceIdService;
/**
* Created by armin on 19.04.17.
*/
public class FcmMessageTokenHandler extends FirebaseInstanceIdService {
private static final String TAG = "FcmMessageTokenHandler";
......
/*
* Copyright 2013 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/********************************************************************************************
* *
* Copyright (C) 2017 Armin Felder, Dennis Beier *
* This file is part of RocketChatMobileEngine <https://git.fairkom.net/chat/fairchat>. *
* *
* RocketChatMobileEngine 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 3 of the License, or *
* (at your option) any later version. *
* *
* RocketChatMobileEngine 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 RocketChatMobileEngine. If not, see <http://www.gnu.org/licenses/>. *
* *
********************************************************************************************/
package com.osalliance.rocketchatMobile;
import android.app.Activity;
import android.Manifest;
import android.content.Context;
import android.content.Intent;
......@@ -30,6 +36,30 @@ import android.os.Build;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.util.Log;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.ActionMode;
import android.view.ActionMode.Callback;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.WindowManager.LayoutParams;
import android.view.WindowManager;
import android.view.Window;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
import android.app.Dialog;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.content.res.Resources.Theme;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GooglePlayServicesUtil;
......@@ -38,10 +68,6 @@ import com.google.android.gms.gcm.GoogleCloudMessaging;
import com.google.firebase.crash.FirebaseCrash;
import android.content.pm.PackageManager;
import android.view.WindowManager;
import android.view.Window;
import android.view.View;
import android.app.NotificationManager;
......@@ -93,6 +119,10 @@ public class MainActivity extends QtActivity {
m_instance = this;
}
@Override
public void onCreate(Bundle savedInstanceState) {
......@@ -350,4 +380,378 @@ public class MainActivity extends QtActivity {
super.onStop();
}
@Override
public boolean dispatchKeyEvent(KeyEvent event)
{
return super.dispatchKeyEvent(event);
}
@Override
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event)
{
return super.dispatchPopulateAccessibilityEvent(event);
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev)
{
return super.dispatchTouchEvent(ev);
}
@Override
public boolean dispatchTrackballEvent(MotionEvent ev)
{
return super.dispatchTrackballEvent(ev);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data)
{
super.onActivityResult(requestCode, resultCode, data);
}
@Override
protected void onApplyThemeResource(Theme theme, int resid, boolean first)
{
super.onApplyThemeResource(theme, resid, first);
}
@Override
protected void onChildTitleChanged(Activity childActivity, CharSequence title)
{
super.onChildTitleChanged(childActivity, title);
}
@Override
public void onConfigurationChanged(Configuration newConfig)
{
super.onConfigurationChanged(newConfig);
}
@Override
public void onContentChanged()
{
super.onContentChanged();
}
@Override
public boolean onContextItemSelected(MenuItem item)
{
return super.onContextItemSelected(item);
}
@Override
public void onContextMenuClosed(Menu menu)
{
super.onContextMenuClosed(menu);
}
@Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo)
{
super.onCreateContextMenu(menu, v, menuInfo);
}
@Override
public CharSequence onCreateDescription()
{
return super.onCreateDescription();
}
@Override
protected Dialog onCreateDialog(int id)
{
return super.onCreateDialog(id);
}
@Override
public boolean onCreateOptionsMenu(Menu menu)
{
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onCreatePanelMenu(int featureId, Menu menu)
{
return super.onCreatePanelMenu(featureId, menu);
}
@Override
public View onCreatePanelView(int featureId)
{
return super.onCreatePanelView(featureId);
}
@Override
public boolean onCreateThumbnail(Bitmap outBitmap, Canvas canvas)
{
return super.onCreateThumbnail(outBitmap, canvas);
}
@Override
public View onCreateView(String name, Context context, AttributeSet attrs)
{
return super.onCreateView(name, context, attrs);
}
@Override
protected void onDestroy()
{
super.onDestroy();
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event)
{
return super.onKeyDown(keyCode, event);
}
@Override
public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event)
{
return super.onKeyMultiple(keyCode, repeatCount, event);
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event)
{
return super.onKeyUp(keyCode, event);
}
@Override
public void onLowMemory()
{
super.onLowMemory();
}
@Override
public boolean onMenuItemSelected(int featureId, MenuItem item)
{
return super.onMenuItemSelected(featureId, item);
}
@Override
public boolean onMenuOpened(int featureId, Menu menu)
{
return super.onMenuOpened(featureId, menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item)
{
return super.onOptionsItemSelected(item);
}
@Override
public void onOptionsMenuClosed(Menu menu)
{
super.onOptionsMenuClosed(menu);
}
@Override
public void onPanelClosed(int featureId, Menu menu)
{
super.onPanelClosed(featureId, menu);
}
@Override
protected void onPause()
{
super.onPause();
}
@Override
protected void onPostCreate(Bundle savedInstanceState)
{
super.onPostCreate(savedInstanceState);
}
@Override
protected void onPostResume()
{
super.onPostResume();
}
@Override
protected void onPrepareDialog(int id, Dialog dialog)
{
super.onPrepareDialog(id, dialog);
}
@Override
public boolean onPrepareOptionsMenu(Menu menu)
{
return super.onPrepareOptionsMenu(menu);
}
@Override
public boolean onPreparePanel(int featureId, View view, Menu menu)
{
return super.onPreparePanel(featureId, view, menu);
}
@Override
protected void onRestart()
{
super.onRestart();
}
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState)
{
super.onRestoreInstanceState(savedInstanceState);
}
@Override
public Object onRetainNonConfigurationInstance()
{
return super.onRetainNonConfigurationInstance();
}
@Override
protected void onSaveInstanceState(Bundle outState)
{
super.onSaveInstanceState(outState);
}
@Override
public boolean onSearchRequested()
{
return super.onSearchRequested();
}
@Override
protected void onTitleChanged(CharSequence title, int color)
{
super.onTitleChanged(title, color);
}
@Override
public boolean onTouchEvent(MotionEvent event)
{
return super.onTouchEvent(event);
}
@Override
public boolean onTrackballEvent(MotionEvent event)
{
return super.onTrackballEvent(event);
}
@Override
public void onUserInteraction()
{
super.onUserInteraction();
}
@Override
protected void onUserLeaveHint()
{
super.onUserLeaveHint();
}
@Override
public void onWindowAttributesChanged(LayoutParams params)
{
super.onWindowAttributesChanged(params);
}
@Override
public void onWindowFocusChanged(boolean hasFocus)
{
super.onWindowFocusChanged(hasFocus);
}
@Override
public void onAttachedToWindow()
{
super.onAttachedToWindow();
}
@Override
public void onBackPressed()
{
super.onBackPressed();
}
@Override
public void onDetachedFromWindow()
{
super.onDetachedFromWindow();
}
@Override
public boolean onKeyLongPress(int keyCode, KeyEvent event)
{
return super.onKeyLongPress(keyCode, event);
}
@Override
protected Dialog onCreateDialog(int id, Bundle args)
{
return super.onCreateDialog(id, args);
}
@Override
protected void onPrepareDialog(int id, Dialog dialog, Bundle args)
{
super.onPrepareDialog(id, dialog, args);
}
@Override
public boolean dispatchKeyShortcutEvent(KeyEvent event)
{
return super.dispatchKeyShortcutEvent(event);
}
@Override
public void onActionModeFinished(ActionMode mode)
{
super.onActionModeFinished(mode);
}
@Override
public void onActionModeStarted(ActionMode mode)
{
super.onActionModeStarted(mode);
}
@Override
public void onAttachFragment(Fragment fragment)
{
super.onAttachFragment(fragment);
}
@Override
public View onCreateView(View parent, String name, Context context, AttributeSet attrs)
{
return super.onCreateView(parent, name, context, attrs);
}
@Override
public boolean onKeyShortcut(int keyCode, KeyEvent event)
{
return super.onKeyShortcut(keyCode, event);
}
@Override
public ActionMode onWindowStartingActionMode(Callback callback)
{
return super.onWindowStartingActionMode(callback);
}
@Override
public boolean dispatchGenericMotionEvent(MotionEvent ev)
{
return super.dispatchGenericMotionEvent(ev);
}
@Override
public boolean onGenericMotionEvent(MotionEvent event)
{
return super.onGenericMotionEvent(event);
}
}
/********************************************************************************************
* *
* Copyright (C) 2017 Armin Felder, Dennis Beier *
* This file is part of RocketChatMobileEngine <https://git.fairkom.net/chat/fairchat>. *
* *
* RocketChatMobileEngine 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 3 of the License, or *
* (at your option) any later version. *
* *
* RocketChatMobileEngine 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 RocketChatMobileEngine. If not, see <http://www.gnu.org/licenses/>. *
* *
********************************************************************************************/
package com.osalliance.rocketchatMobile;
import android.util.Log;
/**
* Created by armin on 08.02.17.
*/
public class ReceiveTextMessage {
private static final String TAG = RegisterTask.class.getSimpleName();
......
/********************************************************************************************
* *
* Copyright (C) 2017 Armin Felder, Dennis Beier *
* This file is part of RocketChatMobileEngine <https://git.fairkom.net/chat/fairchat>. *
* *
* RocketChatMobileEngine 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 3 of the License, or *
* (at your option) any later version. *
* *
* RocketChatMobileEngine is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *