I2P_Developers/i2p.i2p-bote
3
0
Fork 0
Code Issues 4 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Export identities UI

Browse Source
This commit is contained in:
str4d
2014-07-04 23:53:21 +00:00
parent 24e66a08fd
commit a889246066
7 changed files with 441 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/AndroidManifest.xml
View File

@ -117,6 +117,13 @@
android:name="android.support.PARENT_ACTIVITY"
android:value="i2p.bote.android.config.ViewIdentityActivity" />
</activity>
<activity
android:name=".config.IdentityShipActivity"
android:parentActivityName=".config.SettingsActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="i2p.bote.android.config.SettingsActivity" />
</activity>
</application>
</manifest>

48
app/src/main/java/i2p/bote/android/config/IdentityShipActivity.java Normal file
View File

@ -0,0 +1,48 @@
package i2p.bote.android.config;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.widget.Toast;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
public class IdentityShipActivity extends ActionBarActivity implements
IdentityShipFragment.Callbacks {
public static final String EXPORTING = "exporting";
boolean mExporting;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_identity_ship);
// Initialize I2P settings
InitActivities init = new InitActivities(this);
init.initialize();
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
Bundle args = getIntent().getExtras();
mExporting = args.getBoolean(EXPORTING);
IdentityShipFragment f = IdentityShipFragment.newInstance(mExporting);
getSupportFragmentManager().beginTransaction()
.add(R.id.identity_ship_frag, f).commit();
}
}
// IdentityShipFragment.Callbacks
public void onTaskFinished() {
Toast.makeText(this,
mExporting ?
R.string.identities_exported :
R.string.identities_imported,
Toast.LENGTH_SHORT).show();
setResult(RESULT_OK);
finish();
}
}

263
app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java Normal file
View File

@ -0,0 +1,263 @@
package i2p.bote.android.config;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.os.Environment;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.TextView;
import java.io.File;
import i2p.bote.I2PBote;
import i2p.bote.android.R;
import i2p.bote.android.util.RobustAsyncTask;
import i2p.bote.android.util.TaskFragment;
public abstract class IdentityShipFragment extends Fragment {
private Callbacks mCallbacks = sDummyCallbacks;
public interface Callbacks {
public void onTaskFinished();
}
private static Callbacks sDummyCallbacks = new Callbacks() {
public void onTaskFinished() {}
};
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
if (!(activity instanceof Callbacks))
throw new IllegalStateException("Activity must implement fragment's callbacks.");
mCallbacks = (Callbacks) activity;
}
@Override
public void onDetach() {
super.onDetach();
mCallbacks = sDummyCallbacks;
}
// Code to identify the fragment that is calling onActivityResult().
static final int SHIP_WAITER = 0;
// Tag so we can find the task fragment again, in another
// instance of this fragment after rotation.
static final String SHIP_WAITER_TAG = "shipWaiterTask";
TextView mError;
public static IdentityShipFragment newInstance(boolean exporting) {
return new ExportIdentitiesFragment(); // TODO implement importing
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
ShipWaiterFrag f = (ShipWaiterFrag) getFragmentManager().findFragmentByTag(SHIP_WAITER_TAG);
if (f != null)
f.setTargetFragment(this, SHIP_WAITER);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
mError = (TextView) view.findViewById(R.id.error);
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == SHIP_WAITER) {
if (resultCode == Activity.RESULT_OK) {
mCallbacks.onTaskFinished();
} else if (resultCode == Activity.RESULT_CANCELED) {
setInterfaceEnabled(true);
mError.setText(data.getStringExtra("error"));
}
} else {
super.onActivityResult(requestCode, resultCode, data);
}
}
protected abstract void setInterfaceEnabled(boolean enabled);
public static class ShipWaiterFrag extends TaskFragment<Object, String, String> {
static final String SHIP_FILE = "shipFile";
static final String PASSWORD = "password";
String currentStatus;
TextView mStatus;
public static ShipWaiterFrag newInstance(File shipFile, String password) {
ShipWaiterFrag f = new ShipWaiterFrag();
Bundle args = new Bundle();
args.putSerializable(SHIP_FILE, shipFile);
args.putString(PASSWORD, password);
f.setArguments(args);
return f;
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.dialog_status, container, false);
mStatus = (TextView) v.findViewById(R.id.status);
if (currentStatus != null && !currentStatus.isEmpty())
mStatus.setText(currentStatus);
return v;
}
@Override
public Object[] getParams() {
Bundle args = getArguments();
return new Object[]{
(File) args.getSerializable(SHIP_FILE),
args.getString(PASSWORD),
};
}
@Override
public void updateProgress(String... values) {
currentStatus = values[0];
mStatus.setText(currentStatus);
}
@Override
public void taskFinished(String result) {
super.taskFinished(result);
if (getTargetFragment() != null) {
Intent i = new Intent();
i.putExtra("result", result);
getTargetFragment().onActivityResult(
getTargetRequestCode(), Activity.RESULT_OK, i);
}
}
@Override
public void taskCancelled(String error) {
super.taskCancelled(error);
if (getTargetFragment() != null) {
Intent i = new Intent();
i.putExtra("error", error);
getTargetFragment().onActivityResult(
getTargetRequestCode(), Activity.RESULT_CANCELED, i);
}
}
}
public static class ExportIdentitiesFragment extends IdentityShipFragment {
EditText mExportFilename;
TextView mSuffix;
CheckBox mEncrypt;
View mPasswordEntry;
EditText mPassword;
EditText mConfirmPassword;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_export_identities, container, false);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
mExportFilename = (EditText) view.findViewById(R.id.export_filename);
mSuffix = (TextView) view.findViewById(R.id.suffix);
mEncrypt = (CheckBox) view.findViewById(R.id.encrypt);
mPasswordEntry = view.findViewById(R.id.password_entry);
mPassword = (EditText) view.findViewById(R.id.password);
mConfirmPassword = (EditText) view.findViewById(R.id.password_confirm);
mEncrypt.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
mSuffix.setText(b ? ".bote" : ".txt");
mPasswordEntry.setVisibility(b ? View.VISIBLE : View.GONE);
}
});
view.findViewById(R.id.button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String exportFilename = mExportFilename.getText().toString();
String suffix = mSuffix.getText().toString();
boolean encrypt = mEncrypt.isChecked();
String password = null;
if (encrypt) {
password = mPassword.getText().toString();
String confirmPassword = mConfirmPassword.getText().toString();
if (password.isEmpty()) {
mError.setText(R.string.password_empty);
return;
} else if (!password.equals(confirmPassword)) {
mError.setText(R.string.passwords_do_not_match);
return;
}
}
File exportFile = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_DOCUMENTS
), exportFilename + suffix);
if (exportFile.exists()) {
// TODO ask to rename or overwrite
mError.setText(R.string.file_exists);
return;
} else
exportIdentities(exportFile, password);
}
});
}
private void exportIdentities(File exportFile, String password) {
setInterfaceEnabled(false);
mError.setText("");
ShipWaiterFrag f = ShipWaiterFrag.newInstance(exportFile, password);
f.setTask(new ExportWaiter());
f.setTargetFragment(ExportIdentitiesFragment.this, SHIP_WAITER);
getFragmentManager().beginTransaction()
.replace(R.id.waiter_frag, f, SHIP_WAITER_TAG)
.commit();
}
@Override
protected void setInterfaceEnabled(boolean enabled) {
mExportFilename.setEnabled(enabled);
mEncrypt.setEnabled(enabled);
mPassword.setEnabled(enabled);
mConfirmPassword.setEnabled(enabled);
}
private class ExportWaiter extends RobustAsyncTask<Object, String, String> {
@Override
protected String doInBackground(Object... params) {
try {
publishProgress("Exporting identities");
I2PBote.getInstance().getIdentities().export(
(File) params[0],
(String) params[1]);
return null;
} catch (Throwable e) {
cancel(false);
return e.getMessage();
}
}
}
}
}

37
app/src/main/java/i2p/bote/android/config/SettingsActivity.java
View File

@ -136,46 +136,15 @@ public class SettingsActivity extends PreferenceActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.export_identities:
// TODO ask if file should be encrypted
askForExportFilename(null);
Intent ei = new Intent(this, IdentityShipActivity.class);
ei.putExtra(IdentityShipActivity.EXPORTING, true);
startActivity(ei);
return true;
default:
return super.onOptionsItemSelected(item);
}
}
private void askForExportFilename(String password) {
// TODO ask for filename
String exportFilename = "identities";
checkIfExportFileExists(exportFilename, password);
}
private void checkIfExportFileExists(String exportFilename, String password) {
File exportFile = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_DOCUMENTS
), exportFilename + (password == null ? ".txt" : ".bote"));
if (exportFile.exists()) {
// TODO ask to rename or overwrite
//askForExportFilename(password);
exportIdentities(exportFile, password);
} else
exportIdentities(exportFile, password);
}
private void exportIdentities(File exportFile, String password) {
try {
// TODO ask for password
I2PBote.getInstance().getIdentities().export(exportFile, password);
Toast.makeText(this, R.string.identities_exported, Toast.LENGTH_SHORT).show();
} catch (IOException e) {
e.printStackTrace();
} catch (GeneralSecurityException e) {
e.printStackTrace();
} catch (PasswordException e) {
e.printStackTrace();
}
}
//
// Building Headers

23
app/src/main/res/layout/activity_identity_ship.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<FrameLayout
android:id="@+id/identity_ship_frag"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:id="@+id/waiter_frag"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>

93
app/src/main/res/layout/fragment_export_identities.xml Normal file
View File

@ -0,0 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="i2p.bote.android.config.IdentityShipFragment">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Filename" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/export_filename"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_toStartOf="@+id/suffix"
android:text="identities" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=".bote"
android:id="@+id/suffix"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
</RelativeLayout>
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Encrypt"
android:id="@+id/encrypt"
android:checked="true" />
<LinearLayout
android:id="@+id/password_entry"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Password" />
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:id="@+id/password" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Confirm password" />
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:id="@+id/password_confirm" />
</LinearLayout>
<TextView
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/default_identity"
android:textColor="@color/error_color" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Export"
android:id="@+id/button" />
</LinearLayout>

4
app/src/main/res/values/strings.xml
View File

@ -148,6 +148,10 @@
<string name="delete_identity">Delete identity?</string>
<string name="identity_saved">Identity saved</string>
<string name="export_identities">Export identities</string>
<string name="password_empty">Password is empty</string>
<string name="passwords_do_not_match">Passwords do not match</string>
<string name="file_exists">File exists</string>
<string name="identities_exported">Identities exported to Documents folder</string>
<string name="identities_imported">Identities imported</string>
</resources>