Skip to content

Commit 454895f

Browse files
jamescrjamescr
authored
Merge pull request #587 from labexp/develop
Version 2025.09.10
2 parents 0b956e0 + 75bd12e commit 454895f

48 files changed

Lines changed: 2361 additions & 9 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
multiDexEnabled true
1616

1717
// Version code should be increased after each release
18-
versionCode 65
18+
versionCode 69
1919
versionName new Date().format('yyyy.MM.dd')
2020

2121
testApplicationId "net.osmtracker.test"
@@ -78,6 +78,7 @@ dependencies {
7878
implementation 'org.osmdroid:osmdroid-android:6.1.20'
7979
// OAuth
8080
implementation 'net.openid:appauth:0.11.1'
81+
implementation 'com.android.volley:volley:1.2.1'
8182
// For upload traces to osm server
8283
implementation('de.westnordost:osmapi-traces:3.1') {
8384
// Already included in Android

‎app/src/main/AndroidManifest.xml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
android:icon="@drawable/ic_launcher"
2727
android:label="@string/app_name"
2828
android:theme="@style/HighContrast"
29-
android:requestLegacyExternalStorage="true">
29+
android:requestLegacyExternalStorage="true"
30+
android:usesCleartextTraffic="true" >
3031

3132
<uses-library
3233
android:name="org.apache.http.legacy"
@@ -74,6 +75,21 @@
7475
android:scheme="osmtracker"/>
7576
</intent-filter>
7677
</activity>
78+
<activity
79+
android:name=".activity.GitHubUpload"
80+
android:label="Github" />
81+
<activity
82+
android:name=".activity.GitHubConfig"
83+
android:label="Github" />
84+
<activity
85+
android:name=".activity.GitHubNewRepo"
86+
android:label="Github" />
87+
<activity
88+
android:name=".activity.GitHubNewFork"
89+
android:label="Github" />
90+
<activity
91+
android:name=".activity.GitHubPullRequest"
92+
android:label="Github" />
7793
<activity
7894
android:name=".activity.About"
7995
android:label="@string/about" />

‎app/src/main/java/net/osmtracker/GitHubUser.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package net.osmtracker;
2+
3+
import net.osmtracker.github.*;
4+
5+
import android.content.Context;
6+
import android.content.SharedPreferences;
7+
8+
public class GitHubUser {
9+
private SharedPreferences sharedPreferences;
10+
11+
public GitHubUser(Context context) {
12+
sharedPreferences = context.getSharedPreferences(GitHubConstants.SHARED_PREFS_NAME, Context.MODE_PRIVATE);
13+
}
14+
15+
public void saveCredentials(String username, String token) {
16+
sharedPreferences.edit()
17+
.putString(GitHubConstants.KEY_USERNAME, username)
18+
.putString(GitHubConstants.KEY_TOKEN, token)
19+
.apply();
20+
}
21+
22+
public String getUsername() {
23+
return sharedPreferences.getString(GitHubConstants.KEY_USERNAME, "");
24+
}
25+
26+
public String getToken() {
27+
return sharedPreferences.getString(GitHubConstants.KEY_TOKEN, "");
28+
}
29+
30+
public boolean hasCredentials() {
31+
return !getUsername().isEmpty() && getToken().length() == 40;
32+
}
33+
34+
public void clear() {
35+
sharedPreferences.edit().clear().apply();
36+
}
37+
}

‎app/src/main/java/net/osmtracker/activity/GitHubConfig.java‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
package net.osmtracker.activity;
2+
3+
import android.app.Activity;
4+
import android.content.Intent;
5+
import android.content.pm.ActivityInfo;
6+
import android.net.Uri;
7+
import android.os.Bundle;
8+
import android.view.View;
9+
import android.view.View.OnClickListener;
10+
import android.view.WindowManager;
11+
import android.widget.Button;
12+
import android.widget.EditText;
13+
import android.widget.Toast;
14+
15+
import net.osmtracker.GitHubUser;
16+
import net.osmtracker.R;
17+
import static net.osmtracker.github.GitHubConstants.GITHUB_TOKENS_URL;
18+
19+
public class GitHubConfig extends Activity {
20+
EditText editTextUserName, editTextUserToken;
21+
private GitHubUser gitHubUser;
22+
23+
@Override
24+
protected void onCreate(Bundle savedInstanceState) {
25+
super.onCreate(savedInstanceState);
26+
setContentView(R.layout.github_configuration_token);
27+
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
28+
29+
editTextUserName = findViewById(R.id.git_configuration_user_name);
30+
editTextUserToken = findViewById(R.id.git_configuration_user_token);
31+
gitHubUser = new GitHubUser(this);
32+
33+
final Button btnGitHub = (Button) findViewById(R.id.git_link_create_token_btn_ok);
34+
btnGitHub.setOnClickListener(new OnClickListener() {
35+
@Override
36+
public void onClick(View v) {
37+
Intent intent = new Intent(Intent.ACTION_VIEW);
38+
intent.setData(Uri.parse(GITHUB_TOKENS_URL));
39+
startActivity(intent);
40+
}
41+
});
42+
43+
final Button btnSave = (Button) findViewById(R.id.git_save_credentials_btn_ok);
44+
btnSave.setOnClickListener(new OnClickListener() {
45+
@Override
46+
public void onClick(View v) {
47+
String username = editTextUserName.getText().toString().trim();
48+
String ghToken = editTextUserToken.getText().toString().trim();
49+
50+
// Empty is enabled to allow saving without credentials to erase the existing ones
51+
/*
52+
if (username.isEmpty()) {
53+
editTextUserName.setError("Username required");
54+
return;
55+
}
56+
*/
57+
if (ghToken.length() != 40 && !ghToken.isEmpty()) {
58+
editTextUserToken.setError(getString(R.string.error_gh_token_lenght));
59+
return;
60+
}
61+
62+
gitHubUser.saveCredentials(username, ghToken);
63+
Toast.makeText(GitHubConfig.this, R.string.successfully_saved, Toast.LENGTH_SHORT).show();
64+
65+
Intent intent = new Intent(GitHubConfig.this, TrackManager.class);
66+
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
67+
intent.setPackage(this.getClass().getPackage().getName());
68+
startActivity(intent);
69+
finish();
70+
}
71+
});
72+
73+
final Button btnCancel = (Button) findViewById(R.id.git_back_credentials_btn_cancel);
74+
btnCancel.setOnClickListener(new OnClickListener() {
75+
@Override
76+
public void onClick(View v) {
77+
78+
finish();
79+
}
80+
});
81+
82+
// Do not show soft keyboard by default
83+
getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
84+
}
85+
}

‎app/src/main/java/net/osmtracker/activity/GitHubNewFork.java‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
package net.osmtracker.activity;
2+
3+
import android.app.Activity;
4+
import android.content.pm.ActivityInfo;
5+
import android.os.Bundle;
6+
import android.view.View;
7+
import android.view.View.OnClickListener;
8+
import android.view.WindowManager;
9+
import android.widget.Button;
10+
import android.widget.EditText;
11+
import android.widget.Toast;
12+
13+
import androidx.annotation.Nullable;
14+
15+
import com.android.volley.AuthFailureError;
16+
import com.android.volley.Request;
17+
import com.android.volley.Response;
18+
import com.android.volley.VolleyError;
19+
import com.android.volley.toolbox.JsonObjectRequest;
20+
import com.android.volley.toolbox.Volley;
21+
22+
import net.osmtracker.GitHubUser;
23+
import net.osmtracker.R;
24+
import static net.osmtracker.github.GitHubConstants.getRepoForksUrl;
25+
26+
import org.json.JSONException;
27+
import org.json.JSONObject;
28+
29+
import java.util.HashMap;
30+
import java.util.Map;
31+
32+
public class GitHubNewFork extends Activity {
33+
EditText editTextRootUsername, editTextRootRepo;
34+
private GitHubUser gitHubUser;
35+
private String newForkFullName;
36+
37+
@Override
38+
protected void onCreate(@Nullable Bundle savedInstanceState) {
39+
super.onCreate(savedInstanceState);
40+
setContentView(R.layout.git_create_fork);
41+
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
42+
43+
gitHubUser = new GitHubUser(this);
44+
45+
editTextRootUsername = findViewById(R.id.git_username_to_fork_editText_user);
46+
editTextRootRepo = findViewById(R.id.git_repo_to_fork_editText_name);
47+
48+
editTextRootUsername.setHint(R.string.upload_to_github_forked_repo_owner);
49+
editTextRootRepo.setHint(R.string.upload_to_github_forked_repo_name);
50+
51+
final Button btnCreate = (Button) findViewById(R.id.git_create_newfork_btn_ok);
52+
btnCreate.setOnClickListener(new OnClickListener() {
53+
@Override
54+
public void onClick(View v) {
55+
String username = editTextRootUsername.getText().toString().trim();
56+
String repo = editTextRootRepo.getText().toString().trim();
57+
if (username.isEmpty()) {
58+
editTextRootUsername.setError(getString(R.string.error_field_required));
59+
editTextRootUsername.requestFocus();
60+
return;
61+
}
62+
if (repo.isEmpty()) {
63+
editTextRootRepo.setError(getString(R.string.error_field_required));
64+
editTextRootRepo.requestFocus();
65+
return;
66+
}
67+
68+
createNewFork(username, repo);
69+
//Toast.makeText(GitHubNewFork.this, R.string.successfully_created, Toast.LENGTH_SHORT).show();
70+
//finish();
71+
}
72+
});
73+
74+
75+
final Button btnCancel = (Button) findViewById(R.id.git_back_newfork_btn_cancel);
76+
btnCancel.setOnClickListener(new OnClickListener() {
77+
@Override
78+
public void onClick(View v) {
79+
finish();
80+
}
81+
});
82+
83+
// Do not show soft keyboard by default
84+
getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
85+
}
86+
87+
private void createNewFork(String username, String repo) {
88+
String fullURL = getRepoForksUrl(username, repo);
89+
90+
JsonObjectRequest postResquest= new JsonObjectRequest(
91+
Request.Method.POST,
92+
fullURL,
93+
null,
94+
new Response.Listener<JSONObject>() {
95+
@Override
96+
public void onResponse(JSONObject response) {
97+
try {
98+
setNewForkFullName(response.getString("full_name"));
99+
Toast.makeText(GitHubNewFork.this, R.string.successfully_created, Toast.LENGTH_SHORT).show();
100+
finish();
101+
} catch (JSONException e) {
102+
Toast.makeText(GitHubNewFork.this, R.string.error_creating, Toast.LENGTH_SHORT).show();
103+
e.printStackTrace();
104+
}
105+
}
106+
}, new Response.ErrorListener() {
107+
@Override
108+
public void onErrorResponse(VolleyError error) {
109+
Toast.makeText(GitHubNewFork.this, R.string.error_creating, Toast.LENGTH_SHORT).show();
110+
}
111+
}){
112+
@Override
113+
public Map getHeaders() throws AuthFailureError
114+
{
115+
HashMap headers = new HashMap();
116+
headers.put("Authorization", "Bearer " + gitHubUser.getToken());
117+
return headers;
118+
}
119+
};
120+
Volley.newRequestQueue(this).add(postResquest);
121+
}
122+
123+
public void setNewForkFullName(String newForkFullName) {
124+
this.newForkFullName = newForkFullName;
125+
}
126+
}

0 commit comments

Comments
 (0)