luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-21 22:39:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleaned up some code

Browse source
This commit is contained in:
Michael Schättgen 2016-10-26 00:07:39 +02:00
parent ded23a3ae9
commit 32ae66374b
1 changed files with 15 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
app/src/main/java/me/impy/aegis/MainActivity.java
View file

@ -42,7 +42,6 @@ public class MainActivity extends AppCompatActivity {
Database database; Database database;
boolean nightMode = false; boolean nightMode = false;
int count = 0;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -70,15 +69,11 @@ public class MainActivity extends AppCompatActivity {
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(view -> {
@Override Intent scannerActivity = new Intent(getApplicationContext(), ScannerActivity.class);
public void onClick(View view) { startActivityForResult(scannerActivity, GET_KEYINFO);
Intent scannerActivity = new Intent(getApplicationContext(), ScannerActivity.class);
startActivityForResult(scannerActivity, GET_KEYINFO);
}
}); });
// demo
char[] password = "test".toCharArray(); char[] password = "test".toCharArray();
database = Database.createInstance(getApplicationContext(), "keys.db", password); database = Database.createInstance(getApplicationContext(), "keys.db", password);
CryptoUtils.zero(password); CryptoUtils.zero(password);
@ -102,11 +97,6 @@ public class MainActivity extends AppCompatActivity {
}));*/ }));*/
mKeyProfileAdapter = new KeyProfileAdapter(mKeyProfiles); mKeyProfileAdapter = new KeyProfileAdapter(mKeyProfiles);
//rvKeyProfiles.addItemDecoration(new RVHItemDividerDecoration(this, LinearLayoutManager.VERTICAL));
//ItemTouchHelper.Callback callback = new RVHItemTouchHelperCallback(mKeyProfileAdapter, true, false, false);
//ItemTouchHelper helper = new ItemTouchHelper(callback);
//helper.attachToRecyclerView(rvKeyProfiles);
ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(mKeyProfileAdapter); ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(mKeyProfileAdapter);
ItemTouchHelper touchHelper = new ItemTouchHelper(callback); ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
@ -133,20 +123,16 @@ public class MainActivity extends AppCompatActivity {
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
// Check which request we're responding to
if (requestCode == GET_KEYINFO) { if (requestCode == GET_KEYINFO) {
// Make sure the request was successful
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
final KeyProfile keyProfile = (KeyProfile)data.getSerializableExtra("KeyProfile"); final KeyProfile keyProfile = (KeyProfile)data.getSerializableExtra("KeyProfile");
Intent intent = new Intent(this, AddProfileActivity.class); Intent intent = new Intent(this, AddProfileActivity.class);
intent.putExtra("KeyProfile", keyProfile); intent.putExtra("KeyProfile", keyProfile);
startActivityForResult(intent, ADD_KEYINFO); startActivityForResult(intent, ADD_KEYINFO);
//TODO: do something with the result.
} }
} }
else if (requestCode == ADD_KEYINFO) { else if (requestCode == ADD_KEYINFO) {
// Make sure the request was successful
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
final KeyProfile keyProfile = (KeyProfile)data.getSerializableExtra("KeyProfile"); final KeyProfile keyProfile = (KeyProfile)data.getSerializableExtra("KeyProfile");
@ -172,21 +158,6 @@ public class MainActivity extends AppCompatActivity {
} }
} }
private void adjustOrder(int startPosition)
{
Comparator<KeyProfile> comparator = new Comparator<KeyProfile>() {
@Override
public int compare(KeyProfile keyProfile, KeyProfile t1) {
return keyProfile.Order - t1.Order;
}
};
for(int i = startPosition; i < mKeyProfiles.size(); i++)
{
mKeyProfiles.get(i).Order = i + 1;
}
}
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
@ -209,16 +180,12 @@ public class MainActivity extends AppCompatActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.menu_main, menu); getMenuInflater().inflate(R.menu.menu_main, menu);
return true; return true;
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId(); int id = item.getItemId();
//noinspection SimplifiableIfStatement //noinspection SimplifiableIfStatement
@ -235,25 +202,23 @@ public class MainActivity extends AppCompatActivity {
private void setPreferredTheme() private void setPreferredTheme()
{ {
boolean restart = false;
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
if(sharedPreferences.getBoolean("pref_night_mode", false)) if(sharedPreferences.getBoolean("pref_night_mode", false)) {
{ if(!nightMode) {
if(!nightMode)
{
setTheme(R.style.AppTheme_Dark_NoActionBar); setTheme(R.style.AppTheme_Dark_NoActionBar);
finish(); restart = true;
startActivity(new Intent(this, this.getClass()));
} }
} else } else {
{ if(nightMode) {
if(nightMode)
{
setTheme(R.style.AppTheme_Default_NoActionBar); setTheme(R.style.AppTheme_Default_NoActionBar);
finish(); restart = true;
startActivity(new Intent(this, this.getClass()));
} }
} }
if(restart){
finish();
startActivity(new Intent(this, this.getClass()));
}
} }
} }