- Importing Backup is now working

This commit is contained in:
Javier Varona 2018-04-03 20:50:44 -04:00
parent 76355d5142
commit 5db6ce2afc
5 changed files with 147 additions and 2 deletions

View file

@ -17,7 +17,7 @@
android:configChanges="locale" android:configChanges="locale"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name=".activities.IntroActivity" <activity android:name=".activities.IntroActivity"
android:noHistory="true"
android:theme="@style/AppTheme.NoActionBar"> android:theme="@style/AppTheme.NoActionBar">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

View file

@ -1,21 +1,29 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.app.Dialog; import android.app.Dialog;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.widget.Button; import android.widget.Button;
import android.widget.Toast;
import java.net.URISyntaxException;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequestListener;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequests;
import cy.agorise.crystalwallet.requestmanagers.ImportBackupRequest;
import cy.agorise.crystalwallet.util.UriTranslator;
/** /**
* Created by xd on 1/25/18. * Created by xd on 1/25/18.
@ -24,8 +32,12 @@ import cy.agorise.crystalwallet.R;
public class ImportAccountOptionsFragment extends DialogFragment { public class ImportAccountOptionsFragment extends DialogFragment {
public static final int FILE_CONTENT_REQUEST_CODE = 0;
@BindView(R.id.btnCancel) @BindView(R.id.btnCancel)
Button btnClose; Button btnClose;
@BindView(R.id.btnImportBackup)
Button btnImportBackup;
public ImportAccountOptionsFragment() { public ImportAccountOptionsFragment() {
// Required empty public constructor // Required empty public constructor
@ -69,4 +81,50 @@ public class ImportAccountOptionsFragment extends DialogFragment {
public void cancel() { public void cancel() {
dismiss(); dismiss();
} }
@OnClick (R.id.btnImportBackup)
public void importBackup(){
Intent fileIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
fileIntent.setType("*/*");
fileIntent.addCategory(Intent.CATEGORY_OPENABLE);
startActivityForResult(fileIntent, FILE_CONTENT_REQUEST_CODE);
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == FILE_CONTENT_REQUEST_CODE){
Uri fileUri = data.getData();
String filePath = null;
try {
filePath = UriTranslator.getFilePath(getContext(), fileUri);
} catch (URISyntaxException e) {
e.printStackTrace();
}
final ImportBackupRequest importBackupRequest = new ImportBackupRequest(getContext(), "", filePath);
importBackupRequest.setListener(new FileServiceRequestListener() {
@Override
public void onCarryOut() {
if (importBackupRequest.getStatus() == ImportBackupRequest.StatusCode.SUCCEEDED){
Toast toast = Toast.makeText(
getContext(), "Backup restored!", Toast.LENGTH_LONG);
toast.show();
} else if (importBackupRequest.getStatus() == ImportBackupRequest.StatusCode.FAILED){
Toast toast = Toast.makeText(
getContext(), "An error ocurred while restoring the backup!", Toast.LENGTH_LONG);
toast.show();
}
}
});
FileServiceRequests.getInstance().addRequest(importBackupRequest);
}
}
} }

View file

@ -42,6 +42,8 @@ public class FileBackupManager implements FileServiceRequestsListener {
public void onNewRequest(FileServiceRequest request) { public void onNewRequest(FileServiceRequest request) {
if(request instanceof CreateBackupRequest){ if(request instanceof CreateBackupRequest){
createBackupBinFile((CreateBackupRequest) request); createBackupBinFile((CreateBackupRequest) request);
} else if (request instanceof ImportBackupRequest){
readBinFile((ImportBackupRequest) request);
} }
} }

View file

@ -33,6 +33,10 @@ public class ImportBackupRequest extends FileServiceRequest {
this.validate(); this.validate();
} }
public StatusCode getStatus(){
return this.status;
}
public void validate(){ public void validate(){
if (this.status != StatusCode.NOT_STARTED){ if (this.status != StatusCode.NOT_STARTED){
this._fireOnCarryOutEvent(); this._fireOnCarryOutEvent();

View file

@ -0,0 +1,81 @@
package cy.agorise.crystalwallet.util;
import android.content.ContentUris;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
import java.net.URISyntaxException;
/**
* Created by Henry Varona on 3/4/2018.
*/
public class UriTranslator {
public static String getFilePath(Context context, Uri uri) throws URISyntaxException {
String selection = null;
String[] selectionArgs = null;
// Uri is different in versions after KITKAT (Android 4.4), we need to
if (Build.VERSION.SDK_INT >= 19 && DocumentsContract.isDocumentUri(context.getApplicationContext(), uri)) {
if (isExternalStorageDocument(uri)) {
final String docId = DocumentsContract.getDocumentId(uri);
final String[] split = docId.split(":");
return Environment.getExternalStorageDirectory() + "/" + split[1];
} else if (isDownloadsDocument(uri)) {
final String id = DocumentsContract.getDocumentId(uri);
uri = ContentUris.withAppendedId(
Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
} else if (isMediaDocument(uri)) {
final String docId = DocumentsContract.getDocumentId(uri);
final String[] split = docId.split(":");
final String type = split[0];
if ("image".equals(type)) {
uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
} else if ("video".equals(type)) {
uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
} else if ("audio".equals(type)) {
uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
}
selection = "_id=?";
selectionArgs = new String[]{
split[1]
};
}
}
if ("content".equalsIgnoreCase(uri.getScheme())) {
String[] projection = {
MediaStore.Images.Media.DATA
};
Cursor cursor = null;
try {
cursor = context.getContentResolver()
.query(uri, projection, selection, selectionArgs, null);
int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
if (cursor.moveToFirst()) {
return cursor.getString(column_index);
}
} catch (Exception e) {
}
} else if ("file".equalsIgnoreCase(uri.getScheme())) {
return uri.getPath();
}
return null;
}
public static boolean isExternalStorageDocument(Uri uri) {
return "com.android.externalstorage.documents".equals(uri.getAuthority());
}
public static boolean isDownloadsDocument(Uri uri) {
return "com.android.providers.downloads.documents".equals(uri.getAuthority());
}
public static boolean isMediaDocument(Uri uri) {
return "com.android.providers.media.documents".equals(uri.getAuthority());
}
}