kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

some refactoring and improved the creation so that it happens on the visible dir

Browse source
This commit is contained in:
Zeapo 2014-08-06 23:44:34 +01:00
parent ad7b051144
commit c2f520f7bf
4 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.idea/libraries/support_v4_19_1_0.xml
View file

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="support-v4-19.1.0">
<CLASSES>
<root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

1
app/app.iml
View file

@ -63,7 +63,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="JavaEWAH-0.7.9" level="project" />
<orderEntry type="library" exported="" name="jsch-0.1.50" level="project" />
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
<orderEntry type="library" exported="" name="commons-io-1.3.2" level="project" />
<orderEntry type="library" exported="" name="org.eclipse.jgit-3.4.1.201406201815-r" level="project" />
<orderEntry type="module" module-name="openpgp-api-lib" exported="" />

2
app/build.gradle
View file

@ -24,6 +24,4 @@ dependencies {
compile project(':libraries:openpgp-api-lib')
compile 'org.eclipse.jgit:org.eclipse.jgit:3.4.+'
compile 'org.apache.commons:commons-io:1.3.2'
// You must install or update the Support Repository through the SDK manager to use this dependency.
compile 'com.android.support:support-v4:19.+'
}

40
app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
View file

@ -9,6 +9,7 @@ import android.content.Intent;
import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@ -53,7 +54,6 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
@Override
public void onPause() {
super.onPause();
this.leftActivity = true;
}
@Override
@ -88,11 +88,7 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
break;
case R.id.referesh:
PasswordFragment plist;
if (null !=
(plist = (PasswordFragment) getFragmentManager().findFragmentByTag("PasswordsList"))) {
plist.updateAdapter();
}
refreshListAdapter();
return true;
@ -122,15 +118,17 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
}
private void checkLocalRepository(File localDir) {
// if we are coming back from gpg do not anything
if (this.leftActivity)
return;
int status = 0;
FragmentManager fragmentManager = getFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
// if we are coming back from gpg do not anything
if (this.leftActivity) {
this.leftActivity = false;
return;
}
int status = 0;
if (localDir.exists()) {
File[] folders = localDir.listFiles();
status = folders.length;
@ -166,7 +164,6 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
}
this.leftActivity = false;
this.currentDir = localDir;
}
/** Stack the positions the different fragments were at */
@ -205,7 +202,8 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
}
public void createPassword(View v) {
System.out.println("Adding file to : " + this.currentDir.getAbsolutePath());
this.currentDir = new File(((PasswordFragment) getFragmentManager().findFragmentByTag("PasswordsList")).getArguments().getString("Path"));
Log.i("PWDSTR", "Adding file to : " + this.currentDir.getAbsolutePath());
this.leftActivity = true;
try {
@ -220,10 +218,18 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
}
}
private void refreshListAdapter() {
PasswordFragment plist;
if (null !=
(plist = (PasswordFragment) getFragmentManager().findFragmentByTag("PasswordsList"))) {
plist.updateAdapter();
}
}
protected void onActivityResult(int requestCode, int resultCode,
Intent data) {
System.out.println(resultCode);
if (resultCode == RESULT_OK)
checkLocalRepository(this.currentDir);
if (resultCode == RESULT_OK) {
refreshListAdapter();
}
}
}