mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-22 07:57:30 +00:00
Remove deprecated <2.2 caching functionality that breaks modern devices.
This commit is contained in:
parent
607d14c6d7
commit
a627a77077
@ -1,6 +1,6 @@
|
||||
/**
|
||||
/**
|
||||
* Copyright (C) 2011 Whisper Systems
|
||||
*
|
||||
*
|
||||
* 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 3 of the License, or
|
||||
@ -10,23 +10,14 @@
|
||||
* 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, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.thoughtcrime.securesms.service;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.SecureSMS;
|
||||
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||
|
||||
import android.app.AlarmManager;
|
||||
import android.app.Notification;
|
||||
import android.app.NotificationManager;
|
||||
import android.app.PendingIntent;
|
||||
import android.app.Service;
|
||||
import android.content.Intent;
|
||||
@ -37,9 +28,14 @@ import android.os.SystemClock;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.util.Log;
|
||||
|
||||
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.SecureSMS;
|
||||
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||
|
||||
/**
|
||||
* Small service that stays running to keep a key cached in memory.
|
||||
*
|
||||
*
|
||||
* @author Moxie Marlinspike
|
||||
*/
|
||||
|
||||
@ -47,7 +43,7 @@ public class KeyCachingService extends Service {
|
||||
|
||||
public static final int NOTIFICATION_ID = 1337;
|
||||
public static final int SERVICE_RUNNING_ID = 4141;
|
||||
|
||||
|
||||
public static final String KEY_PERMISSION = "org.thoughtcrime.securesms.ACCESS_SECRETS";
|
||||
public static final String NEW_KEY_EVENT = "org.thoughtcrime.securesms.service.action.NEW_KEY_EVENT";
|
||||
public static final String PASSPHRASE_EXPIRED_EVENT = "org.thoughtcrime.securesms.service.action.PASSPHRASE_EXPIRED_EVENT";
|
||||
@ -56,35 +52,27 @@ public class KeyCachingService extends Service {
|
||||
public static final String ACTIVITY_STOP_EVENT = "org.thoughtcrime.securesms.service.action.ACTIVITY_STOP_EVENT";
|
||||
public static final String PREFERENCES_NAME = "SecureSMS-Preferences";
|
||||
|
||||
private static final Class[] mStartForegroundSignature = new Class[] {int.class, Notification.class};
|
||||
private static final Class[] mStopForegroundSignature = new Class[] {boolean.class};
|
||||
|
||||
|
||||
private PendingIntent pending;
|
||||
private NotificationManager notificationManager;
|
||||
private Method mStartForeground;
|
||||
private Method mStopForeground;
|
||||
|
||||
private Object[] mStartForegroundArgs = new Object[2];
|
||||
private Object[] mStopForegroundArgs = new Object[1];
|
||||
private int activitiesRunning = 0;
|
||||
private final IBinder binder = new KeyCachingBinder();
|
||||
|
||||
private int activitiesRunning = 0;
|
||||
private final IBinder binder = new KeyCachingBinder();
|
||||
|
||||
private MasterSecret masterSecret;
|
||||
|
||||
|
||||
public KeyCachingService() {}
|
||||
|
||||
public synchronized MasterSecret getMasterSecret() {
|
||||
return masterSecret;
|
||||
}
|
||||
|
||||
|
||||
public synchronized void setMasterSecret(MasterSecret masterSecret) {
|
||||
this.masterSecret = masterSecret;
|
||||
|
||||
|
||||
foregroundService();
|
||||
broadcastNewSecret();
|
||||
startTimeoutIfAppropriate();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onStart(Intent intent, int startId) {
|
||||
if (intent.getAction() != null && intent.getAction().equals(CLEAR_KEY_ACTION))
|
||||
@ -96,31 +84,22 @@ public class KeyCachingService extends Service {
|
||||
else if (intent.getAction() != null && intent.getAction().equals(PASSPHRASE_EXPIRED_EVENT))
|
||||
handlePassphraseExpired();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
pending = PendingIntent.getService(this, 0, new Intent(PASSPHRASE_EXPIRED_EVENT, null, this, KeyCachingService.class), 0);
|
||||
notificationManager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
|
||||
|
||||
try {
|
||||
mStartForeground = getClass().getMethod("startForeground", mStartForegroundSignature);
|
||||
mStopForeground = getClass().getMethod("stopForeground", mStopForegroundSignature);
|
||||
} catch (NoSuchMethodException e) {
|
||||
// Running on an older platform.
|
||||
mStartForeground = mStopForeground = null;
|
||||
}
|
||||
pending = PendingIntent.getService(this, 0, new Intent(PASSPHRASE_EXPIRED_EVENT, null, this, KeyCachingService.class), 0);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
Log.e("kcs", "KCS Is Being Destroyed!");
|
||||
}
|
||||
|
||||
|
||||
private void handleActivityStarted() {
|
||||
Log.w("KeyCachingService", "Incrementing activity count...");
|
||||
|
||||
|
||||
AlarmManager alarmManager = (AlarmManager)this.getSystemService(ALARM_SERVICE);
|
||||
alarmManager.cancel(pending);
|
||||
alarmManager.cancel(pending);
|
||||
activitiesRunning++;
|
||||
}
|
||||
|
||||
@ -130,46 +109,46 @@ public class KeyCachingService extends Service {
|
||||
activitiesRunning--;
|
||||
startTimeoutIfAppropriate();
|
||||
}
|
||||
|
||||
|
||||
private void handleClearKey() {
|
||||
this.masterSecret = null;
|
||||
stopForegroundCompat(SERVICE_RUNNING_ID);
|
||||
stopForeground(true);
|
||||
}
|
||||
|
||||
|
||||
private void handlePassphraseExpired() {
|
||||
handleClearKey();
|
||||
Intent intent = new Intent(PASSPHRASE_EXPIRED_EVENT);
|
||||
intent.setPackage(getApplicationContext().getPackageName());
|
||||
|
||||
|
||||
sendBroadcast(intent, KEY_PERMISSION);
|
||||
}
|
||||
|
||||
|
||||
private void startTimeoutIfAppropriate() {
|
||||
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
boolean timeoutEnabled = sharedPreferences.getBoolean(ApplicationPreferencesActivity.PASSPHRASE_TIMEOUT_PREF, false);
|
||||
|
||||
|
||||
if ((activitiesRunning == 0) && (this.masterSecret != null) && timeoutEnabled) {
|
||||
long timeoutMinutes = sharedPreferences.getInt(ApplicationPreferencesActivity.PASSPHRASE_TIMEOUT_INTERVAL_PREF, 60 * 5);
|
||||
long timeoutMillis = timeoutMinutes * 60 * 1000;
|
||||
|
||||
Log.w("KeyCachingService", "Starting timeout: " + timeoutMillis);
|
||||
|
||||
|
||||
AlarmManager alarmManager = (AlarmManager)this.getSystemService(ALARM_SERVICE);
|
||||
alarmManager.cancel(pending);
|
||||
alarmManager.set(AlarmManager.ELAPSED_REALTIME, SystemClock.elapsedRealtime() + timeoutMillis, pending);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void foregroundService() {
|
||||
Notification notification = new Notification(R.drawable.icon, "TextSecure Passphrase Cached", System.currentTimeMillis());
|
||||
Intent intent = new Intent(this, SecureSMS.class);
|
||||
PendingIntent launchIntent = PendingIntent.getActivity(getApplicationContext(), 0, intent, 0);
|
||||
notification.setLatestEventInfo(getApplicationContext(), "TextSecure Cached", "TextSecure Passphrase Cached", launchIntent);
|
||||
|
||||
stopForegroundCompat(SERVICE_RUNNING_ID);
|
||||
startForegroundCompat(SERVICE_RUNNING_ID, notification);
|
||||
|
||||
stopForeground(true);
|
||||
startForeground(SERVICE_RUNNING_ID, notification);
|
||||
}
|
||||
|
||||
|
||||
private void broadcastNewSecret() {
|
||||
Log.w("service", "Broadcasting new secret...");
|
||||
Intent intent = new Intent(NEW_KEY_EVENT);
|
||||
@ -178,61 +157,16 @@ public class KeyCachingService extends Service {
|
||||
|
||||
sendBroadcast(intent, KEY_PERMISSION);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public IBinder onBind(Intent arg0) {
|
||||
return binder;
|
||||
}
|
||||
|
||||
|
||||
public class KeyCachingBinder extends Binder {
|
||||
public KeyCachingService getService() {
|
||||
return KeyCachingService.this;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* This is a wrapper around the new startForeground method, using the older
|
||||
* APIs if it is not available.
|
||||
*/
|
||||
private void startForegroundCompat(int id, Notification notification) {
|
||||
if (mStartForeground != null) {
|
||||
mStartForegroundArgs[0] = Integer.valueOf(id);
|
||||
mStartForegroundArgs[1] = notification;
|
||||
|
||||
try {
|
||||
mStartForeground.invoke(this, mStartForegroundArgs);
|
||||
} catch (InvocationTargetException e) {
|
||||
Log.w("KeyCachingService", "Unable to invoke startForeground", e);
|
||||
} catch (IllegalAccessException e) {
|
||||
Log.w("KeyCachingService", "Unable to invoke startForeground", e);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
setForeground(true);
|
||||
notificationManager.notify(id, notification);
|
||||
}
|
||||
|
||||
/**
|
||||
* This is a wrapper around the new stopForeground method, using the older
|
||||
* APIs if it is not available.
|
||||
*/
|
||||
private void stopForegroundCompat(int id) {
|
||||
Log.w("KeyCachingService", "Calling stopForeground!");
|
||||
if (mStopForeground != null) {
|
||||
mStopForegroundArgs[0] = Boolean.TRUE;
|
||||
try {
|
||||
mStopForeground.invoke(this, mStopForegroundArgs);
|
||||
} catch (InvocationTargetException e) {
|
||||
Log.w("KeyCachingService", "Unable to invoke stopForeground", e);
|
||||
} catch (IllegalAccessException e) {
|
||||
Log.w("KeyCachingService", "Unable to invoke stopForeground", e);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
notificationManager.cancel(id);
|
||||
setForeground(false);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user