GitActivity: Cleanup obvious code smells
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
This commit is contained in:
parent
168c3d42aa
commit
f05c0b37ca
1 changed files with 11 additions and 18 deletions
|
@ -28,8 +28,6 @@ import com.zeapo.pwdstore.git.config.SshApiSessionFactory;
|
||||||
import com.zeapo.pwdstore.utils.PasswordRepository;
|
import com.zeapo.pwdstore.utils.PasswordRepository;
|
||||||
|
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
import org.eclipse.jgit.api.Git;
|
|
||||||
import org.eclipse.jgit.api.RebaseCommand;
|
|
||||||
import org.eclipse.jgit.lib.Constants;
|
import org.eclipse.jgit.lib.Constants;
|
||||||
import org.eclipse.jgit.lib.ObjectId;
|
import org.eclipse.jgit.lib.ObjectId;
|
||||||
import org.eclipse.jgit.lib.Ref;
|
import org.eclipse.jgit.lib.Ref;
|
||||||
|
@ -350,7 +348,7 @@ public class GitActivity extends AppCompatActivity {
|
||||||
EditText server_user = findViewById(R.id.server_user);
|
EditText server_user = findViewById(R.id.server_user);
|
||||||
|
|
||||||
String uri = server_uri.getText().toString();
|
String uri = server_uri.getText().toString();
|
||||||
Pattern pattern = Pattern.compile("(.+)@([\\w\\d\\.]+):([\\d]+)*(.*)");
|
Pattern pattern = Pattern.compile("(.+)@([\\w\\d.]+):([\\d]+)*(.*)");
|
||||||
Matcher matcher = pattern.matcher(uri);
|
Matcher matcher = pattern.matcher(uri);
|
||||||
if (matcher.find()) {
|
if (matcher.find()) {
|
||||||
int count = matcher.groupCount();
|
int count = matcher.groupCount();
|
||||||
|
@ -402,8 +400,7 @@ public class GitActivity extends AppCompatActivity {
|
||||||
// automatically handle clicks on the Home/Up button, so long
|
// automatically handle clicks on the Home/Up button, so long
|
||||||
// as you specify a parent activity in AndroidManifest.xml.
|
// as you specify a parent activity in AndroidManifest.xml.
|
||||||
int id = item.getItemId();
|
int id = item.getItemId();
|
||||||
switch (id) {
|
if (id == R.id.user_pref) {
|
||||||
case R.id.user_pref:
|
|
||||||
try {
|
try {
|
||||||
Intent intent = new Intent(this, UserPreference.class);
|
Intent intent = new Intent(this, UserPreference.class);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
|
@ -412,7 +409,6 @@ public class GitActivity extends AppCompatActivity {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
@ -660,6 +656,7 @@ public class GitActivity extends AppCompatActivity {
|
||||||
|
|
||||||
switch (operation) {
|
switch (operation) {
|
||||||
case REQUEST_CLONE:
|
case REQUEST_CLONE:
|
||||||
|
case GitOperation.GET_SSH_KEY_FROM_CLONE:
|
||||||
op = new CloneOperation(localDir, activity).setCommand(hostname);
|
op = new CloneOperation(localDir, activity).setCommand(hostname);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -679,10 +676,6 @@ public class GitActivity extends AppCompatActivity {
|
||||||
op = new BreakOutOfDetached(localDir, activity).setCommands();
|
op = new BreakOutOfDetached(localDir, activity).setCommands();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GitOperation.GET_SSH_KEY_FROM_CLONE:
|
|
||||||
op = new CloneOperation(localDir, activity).setCommand(hostname);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SshApiSessionFactory.POST_SIGNATURE:
|
case SshApiSessionFactory.POST_SIGNATURE:
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue