Private files using a boolean flag from Config.java.
This commit is contained in:
parent
6371d2b7a9
commit
297c0a792f
|
@ -97,6 +97,8 @@ public final class Config {
|
||||||
|
|
||||||
public static final boolean X509_VERIFICATION = false; //use x509 certificates to verify OMEMO keys
|
public static final boolean X509_VERIFICATION = false; //use x509 certificates to verify OMEMO keys
|
||||||
|
|
||||||
|
public static final boolean ONLY_INTERNAL_STORAGE = false; //use internal storage instead of sdcard to save attachments
|
||||||
|
|
||||||
public static final boolean IGNORE_ID_REWRITE_IN_MUC = true;
|
public static final boolean IGNORE_ID_REWRITE_IN_MUC = true;
|
||||||
|
|
||||||
public static final boolean PARSE_REAL_JID_FROM_MUC_MAM = false; //dangerous if server doesn’t filter
|
public static final boolean PARSE_REAL_JID_FROM_MUC_MAM = false; //dangerous if server doesn’t filter
|
||||||
|
|
|
@ -151,14 +151,26 @@ public class FileBackend {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getConversationsFileDirectory() {
|
public String getConversationsFileDirectory() {
|
||||||
return Environment.getExternalStorageDirectory().getAbsolutePath()+"/Conversations/";
|
if (Config.ONLY_INTERNAL_STORAGE) {
|
||||||
|
return mXmppConnectionService.getFilesDir().getAbsolutePath() + "/Files/";
|
||||||
|
} else {
|
||||||
|
return Environment.getExternalStorageDirectory().getAbsolutePath() + "/Conversations/";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getConversationsImageDirectory() {
|
public String getConversationsImageDirectory() {
|
||||||
return Environment.getExternalStoragePublicDirectory(
|
if (Config.ONLY_INTERNAL_STORAGE) {
|
||||||
Environment.DIRECTORY_PICTURES).getAbsolutePath()
|
return mXmppConnectionService.getFilesDir().getAbsolutePath()+"/Pictures/";
|
||||||
+ "/Conversations/";
|
} else {
|
||||||
|
return Environment.getExternalStoragePublicDirectory(
|
||||||
|
Environment.DIRECTORY_PICTURES).getAbsolutePath()
|
||||||
|
+ "/Conversations/";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getConversationsLogsDirectory() {
|
||||||
|
return Environment.getExternalStorageDirectory().getAbsolutePath()+"/Conversations/";
|
||||||
}
|
}
|
||||||
|
|
||||||
public Bitmap resize(Bitmap originalBitmap, int size) {
|
public Bitmap resize(Bitmap originalBitmap, int size) {
|
||||||
|
@ -438,9 +450,14 @@ public class FileBackend {
|
||||||
}
|
}
|
||||||
|
|
||||||
public Uri getTakePhotoUri() {
|
public Uri getTakePhotoUri() {
|
||||||
File file = new File(getTakePhotoPath()+"IMG_" + this.IMAGE_DATE_FORMAT.format(new Date()) + ".jpg");
|
File file;
|
||||||
|
if (Config.ONLY_INTERNAL_STORAGE) {
|
||||||
|
file = new File(mXmppConnectionService.getCacheDir().getAbsolutePath(), "Camera/IMG_" + this.IMAGE_DATE_FORMAT.format(new Date()) + ".jpg");
|
||||||
|
} else {
|
||||||
|
file = new File(getTakePhotoPath() + "IMG_" + this.IMAGE_DATE_FORMAT.format(new Date()) + ".jpg");
|
||||||
|
}
|
||||||
file.getParentFile().mkdirs();
|
file.getParentFile().mkdirs();
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N || Config.ONLY_INTERNAL_STORAGE) {
|
||||||
return FileProvider.getUriForFile(mXmppConnectionService, CONVERSATIONS_FILE_PROVIDER, file);
|
return FileProvider.getUriForFile(mXmppConnectionService, CONVERSATIONS_FILE_PROVIDER, file);
|
||||||
} else {
|
} else {
|
||||||
return Uri.fromFile(file);
|
return Uri.fromFile(file);
|
||||||
|
@ -448,7 +465,7 @@ public class FileBackend {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Uri getIndexableTakePhotoUri(Uri original) {
|
public static Uri getIndexableTakePhotoUri(Uri original) {
|
||||||
if ("file".equals(original.getScheme())) {
|
if (Config.ONLY_INTERNAL_STORAGE || "file".equals(original.getScheme())) {
|
||||||
return original;
|
return original;
|
||||||
} else {
|
} else {
|
||||||
List<String> segments = original.getPathSegments();
|
List<String> segments = original.getPathSegments();
|
||||||
|
@ -695,7 +712,8 @@ public class FileBackend {
|
||||||
|
|
||||||
public Uri getJingleFileUri(Message message) {
|
public Uri getJingleFileUri(Message message) {
|
||||||
File file = getFile(message);
|
File file = getFile(message);
|
||||||
return Uri.parse("file://" + file.getAbsolutePath());
|
return FileProvider.getUriForFile(mXmppConnectionService,
|
||||||
|
CONVERSATIONS_FILE_PROVIDER, file);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateFileParams(Message message) {
|
public void updateFileParams(Message message) {
|
||||||
|
|
|
@ -26,7 +26,7 @@ import eu.siacs.conversations.xmpp.jid.Jid;
|
||||||
public class ExportLogsService extends Service {
|
public class ExportLogsService extends Service {
|
||||||
|
|
||||||
private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
|
private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
|
||||||
private static final String DIRECTORY_STRING_FORMAT = FileBackend.getConversationsFileDirectory() + "/logs/%s";
|
private static final String DIRECTORY_STRING_FORMAT = FileBackend.getConversationsLogsDirectory() + "/logs/%s";
|
||||||
private static final String MESSAGE_STRING_FORMAT = "(%s) %s: %s\n";
|
private static final String MESSAGE_STRING_FORMAT = "(%s) %s: %s\n";
|
||||||
private static final int NOTIFICATION_ID = 1;
|
private static final int NOTIFICATION_ID = 1;
|
||||||
private static AtomicBoolean running = new AtomicBoolean(false);
|
private static AtomicBoolean running = new AtomicBoolean(false);
|
||||||
|
|
|
@ -494,6 +494,7 @@ public class ConversationActivity extends XmppActivity
|
||||||
case ATTACHMENT_CHOICE_TAKE_PHOTO:
|
case ATTACHMENT_CHOICE_TAKE_PHOTO:
|
||||||
Uri uri = xmppConnectionService.getFileBackend().getTakePhotoUri();
|
Uri uri = xmppConnectionService.getFileBackend().getTakePhotoUri();
|
||||||
intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
|
intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
|
||||||
|
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||||
intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
|
intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
|
||||||
intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
|
intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
|
||||||
mPendingImageUris.clear();
|
mPendingImageUris.clear();
|
||||||
|
@ -1412,9 +1413,11 @@ public class ConversationActivity extends XmppActivity
|
||||||
attachImageToConversation(getSelectedConversation(), uri);
|
attachImageToConversation(getSelectedConversation(), uri);
|
||||||
mPendingImageUris.clear();
|
mPendingImageUris.clear();
|
||||||
}
|
}
|
||||||
Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
|
if (!Config.ONLY_INTERNAL_STORAGE) {
|
||||||
intent.setData(uri);
|
Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
|
||||||
sendBroadcast(intent);
|
intent.setData(uri);
|
||||||
|
sendBroadcast(intent);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
mPendingImageUris.clear();
|
mPendingImageUris.clear();
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
|
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
|
import android.net.Uri;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.preference.ListPreference;
|
import android.preference.ListPreference;
|
||||||
|
@ -14,8 +15,10 @@ import android.preference.Preference;
|
||||||
import android.preference.PreferenceCategory;
|
import android.preference.PreferenceCategory;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import android.preference.PreferenceScreen;
|
import android.preference.PreferenceScreen;
|
||||||
|
import android.util.Log;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.security.KeyStoreException;
|
import java.security.KeyStoreException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
@ -156,6 +159,26 @@ public class SettingsActivity extends XmppActivity implements
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (Config.ONLY_INTERNAL_STORAGE) {
|
||||||
|
final Preference cleanCachePreference = mSettingsFragment.findPreference("clean_cache");
|
||||||
|
cleanCachePreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceClick(Preference preference) {
|
||||||
|
cleanCache();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
final Preference cleanPrivateStoragePreference = mSettingsFragment.findPreference("clean_private_storage");
|
||||||
|
cleanPrivateStoragePreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceClick(Preference preference) {
|
||||||
|
cleanPrivateStorage();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
final Preference deleteOmemoPreference = mSettingsFragment.findPreference("delete_omemo_identities");
|
final Preference deleteOmemoPreference = mSettingsFragment.findPreference("delete_omemo_identities");
|
||||||
deleteOmemoPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
|
deleteOmemoPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -166,6 +189,57 @@ public class SettingsActivity extends XmppActivity implements
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void cleanCache() {
|
||||||
|
Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
|
||||||
|
intent.setData(Uri.parse("package:" + getPackageName()));
|
||||||
|
startActivity(intent);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cleanPrivateStorage() {
|
||||||
|
cleanPrivatePictures();
|
||||||
|
cleanPrivateFiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cleanPrivatePictures() {
|
||||||
|
try {
|
||||||
|
File dir = new File(getFilesDir().getAbsolutePath(), "/Pictures/");
|
||||||
|
File[] array = dir.listFiles();
|
||||||
|
if (array != null) {
|
||||||
|
for (int b = 0; b < array.length; b++) {
|
||||||
|
String name = array[b].getName().toLowerCase();
|
||||||
|
if (name.equals(".nomedia")) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (array[b].isFile()) {
|
||||||
|
array[b].delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.e("CleanCache", e.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cleanPrivateFiles() {
|
||||||
|
try {
|
||||||
|
File dir = new File(getFilesDir().getAbsolutePath(), "/Files/");
|
||||||
|
File[] array = dir.listFiles();
|
||||||
|
if (array != null) {
|
||||||
|
for (int b = 0; b < array.length; b++) {
|
||||||
|
String name = array[b].getName().toLowerCase();
|
||||||
|
if (name.equals(".nomedia")) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (array[b].isFile()) {
|
||||||
|
array[b].delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.e("CleanCache", e.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void deleteOmemoIdentities() {
|
private void deleteOmemoIdentities() {
|
||||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||||
builder.setTitle(R.string.pref_delete_omemo_identities);
|
builder.setTitle(R.string.pref_delete_omemo_identities);
|
||||||
|
|
|
@ -3,6 +3,7 @@ package eu.siacs.conversations.ui;
|
||||||
import android.app.Dialog;
|
import android.app.Dialog;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.preference.Preference;
|
import android.preference.Preference;
|
||||||
|
import android.preference.PreferenceCategory;
|
||||||
import android.preference.PreferenceFragment;
|
import android.preference.PreferenceFragment;
|
||||||
import android.preference.PreferenceScreen;
|
import android.preference.PreferenceScreen;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
@ -11,6 +12,7 @@ import android.view.ViewParent;
|
||||||
import android.widget.FrameLayout;
|
import android.widget.FrameLayout;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
|
|
||||||
|
import eu.siacs.conversations.Config;
|
||||||
import eu.siacs.conversations.R;
|
import eu.siacs.conversations.R;
|
||||||
|
|
||||||
public class SettingsFragment extends PreferenceFragment {
|
public class SettingsFragment extends PreferenceFragment {
|
||||||
|
@ -52,6 +54,16 @@ public class SettingsFragment extends PreferenceFragment {
|
||||||
|
|
||||||
// Load the preferences from an XML resource
|
// Load the preferences from an XML resource
|
||||||
addPreferencesFromResource(R.xml.preferences);
|
addPreferencesFromResource(R.xml.preferences);
|
||||||
|
|
||||||
|
// Remove from standard preferences if the flag ONLY_INTERNAL_STORAGE is not true
|
||||||
|
if (!Config.ONLY_INTERNAL_STORAGE) {
|
||||||
|
PreferenceCategory mCategory = (PreferenceCategory) findPreference("security_options");
|
||||||
|
Preference mPref1 = findPreference("clean_cache");
|
||||||
|
Preference mPref2 = findPreference("clean_private_storage");
|
||||||
|
mCategory.removePreference(mPref1);
|
||||||
|
mCategory.removePreference(mPref2);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -697,12 +697,16 @@ public class MessageAdapter extends ArrayAdapter<Message> {
|
||||||
mime = "*/*";
|
mime = "*/*";
|
||||||
}
|
}
|
||||||
Uri uri;
|
Uri uri;
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N || Config.ONLY_INTERNAL_STORAGE) {
|
||||||
try {
|
try {
|
||||||
uri = FileProvider.getUriForFile(activity, FileBackend.CONVERSATIONS_FILE_PROVIDER, file);
|
uri = FileProvider.getUriForFile(activity, FileBackend.CONVERSATIONS_FILE_PROVIDER, file);
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
Toast.makeText(activity,activity.getString(R.string.no_permission_to_access_x,file.getAbsolutePath()), Toast.LENGTH_SHORT).show();
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||||
return;
|
Toast.makeText(activity, activity.getString(R.string.no_permission_to_access_x, file.getAbsolutePath()), Toast.LENGTH_SHORT).show();
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
uri = Uri.fromFile(file);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
openIntent.setDataAndType(uri, mime);
|
openIntent.setDataAndType(uri, mime);
|
||||||
openIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
openIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||||
|
|
|
@ -693,4 +693,8 @@
|
||||||
<string name="pref_delete_omemo_identities_summary">Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.</string>
|
<string name="pref_delete_omemo_identities_summary">Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.</string>
|
||||||
<string name="delete_selected_keys">Delete selected keys</string>
|
<string name="delete_selected_keys">Delete selected keys</string>
|
||||||
<string name="error_publish_avatar_offline">You need to be connected to publish your avatar.</string>
|
<string name="error_publish_avatar_offline">You need to be connected to publish your avatar.</string>
|
||||||
|
<string name="pref_clean_cache_summary">Clean cache folder (used by Camera Application)</string>
|
||||||
|
<string name="pref_clean_cache">Clean cache</string>
|
||||||
|
<string name="pref_clean_private_storage">Clean private storage</string>
|
||||||
|
<string name="pref_clean_private_storage_summary">Clean private storage where files are kept (They can be re-downloaded from the server)</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<paths>
|
<paths>
|
||||||
<external-path name="external" path="/"/>
|
<external-path name="external" path="/"/>
|
||||||
|
<files-path path="Pictures/" name="pics" />
|
||||||
|
<files-path path="Files/" name="files" />
|
||||||
|
<cache-path path="Camera/" name="cam" />
|
||||||
</paths>
|
</paths>
|
|
@ -163,7 +163,8 @@
|
||||||
android:key="expert"
|
android:key="expert"
|
||||||
android:summary="@string/pref_expert_options_summary"
|
android:summary="@string/pref_expert_options_summary"
|
||||||
android:title="@string/pref_expert_options">
|
android:title="@string/pref_expert_options">
|
||||||
<PreferenceCategory android:title="@string/pref_security_settings">
|
<PreferenceCategory android:title="@string/pref_security_settings"
|
||||||
|
android:key="security_options">
|
||||||
<CheckBoxPreference
|
<CheckBoxPreference
|
||||||
android:defaultValue="false"
|
android:defaultValue="false"
|
||||||
android:key="dont_save_encrypted"
|
android:key="dont_save_encrypted"
|
||||||
|
@ -183,6 +184,14 @@
|
||||||
android:key="allow_message_correction"
|
android:key="allow_message_correction"
|
||||||
android:title="@string/pref_allow_message_correction"
|
android:title="@string/pref_allow_message_correction"
|
||||||
android:summary="@string/pref_allow_message_correction_summary"/>
|
android:summary="@string/pref_allow_message_correction_summary"/>
|
||||||
|
<Preference
|
||||||
|
android:key="clean_cache"
|
||||||
|
android:summary="@string/pref_clean_cache_summary"
|
||||||
|
android:title="@string/pref_clean_cache"/>
|
||||||
|
<Preference
|
||||||
|
android:key="clean_private_storage"
|
||||||
|
android:summary="@string/pref_clean_private_storage_summary"
|
||||||
|
android:title="@string/pref_clean_private_storage"/>
|
||||||
<Preference
|
<Preference
|
||||||
android:key="delete_omemo_identities"
|
android:key="delete_omemo_identities"
|
||||||
android:title="@string/pref_delete_omemo_identities"
|
android:title="@string/pref_delete_omemo_identities"
|
||||||
|
|
Loading…
Reference in a new issue