Upload traces directly to Github. Corrections to PR361

app/build.gradle

@@ -97,6 +97,7 @@ dependencies {
     // For upload traces to osm server
     implementation 'net.openid:appauth:0.11.1'
     implementation 'de.westnordost:osmapi-traces:3.1'
+    implementation 'com.android.volley:volley:1.2.1'
 
     // Required for local unit tests (JUnit 4 framework)
     testImplementation 'junit:junit:4.12'

app/src/main/AndroidManifest.xml

@@ -24,7 +24,8 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/HighContrast"
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        android:usesCleartextTraffic="true" >
 
         <uses-library
             android:name="org.apache.http.legacy"
@@ -72,6 +73,21 @@
                     android:scheme="osmtracker"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".activity.GitHubUpload"
+            android:label="Github" />
+        <activity
+            android:name=".activity.GitHubConfig"
+            android:label="Github" />
+        <activity
+            android:name=".activity.GitHubNewRepo"
+            android:label="Github" />
+        <activity
+            android:name=".activity.GitHubNewFork"
+            android:label="Github" />
+        <activity
+            android:name=".activity.GitHubPullRequest"
+            android:label="Github" />
         <activity
             android:name=".activity.About"
             android:label="@string/about" />

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

@@ -0,0 +1,38 @@
+package net.osmtracker;
+
+public class GitHubUser {
+
+    private int id;
+    private String username;
+    private String token;
+
+    public GitHubUser() {
+        setId(-1);
+        setUsername("");
+        setToken("");
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+}

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

@@ -0,0 +1,82 @@
+package net.osmtracker.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import net.osmtracker.R;
+import net.osmtracker.db.DBGitHelper;
+import net.osmtracker.db.DbGitHubUser;
+
+public class GitHubConfig extends Activity {
+
+    private final static String GitHubToken_URL = "https://github.com/settings/tokens";
+
+    EditText editTextUserName, editTextUserToken;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.github_configuration_token);
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+
+        editTextUserName = findViewById(R.id.git_configuration_user_name);
+        editTextUserToken = findViewById(R.id.git_configuration_user_token);
+
+        final Button btnGitHub = (Button) findViewById(R.id.git_link_create_token_btn_ok);
+        btnGitHub.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(GitHubToken_URL));
+                startActivity(intent);
+            }
+        });
+
+        final Button btnSave = (Button) findViewById(R.id.git_save_credentials_btn_ok);
+        btnSave.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                DBGitHelper dbGitHelper = new DBGitHelper( GitHubConfig.this);
+                SQLiteDatabase db = dbGitHelper.getWritableDatabase();
+
+                if(db == null){
+                    Toast.makeText(GitHubConfig.this, R.string.db_error, Toast.LENGTH_SHORT).show();
+                }
+
+                DbGitHubUser dbGitHubUser = new DbGitHubUser(GitHubConfig.this);
+                long id = dbGitHubUser.insertUser(editTextUserName.getText().toString().trim(),editTextUserToken.getText().toString().trim());
+
+                if (id > 0){
+                    Toast.makeText(GitHubConfig.this, R.string.successfully_saved, Toast.LENGTH_SHORT).show();
+                    finish();
+                }else {
+                    Toast.makeText(GitHubConfig.this, R.string.saving_error, Toast.LENGTH_SHORT).show();
+                }
+
+            }
+        });
+
+        final Button btnCancel = (Button) findViewById(R.id.git_back_credentials_btn_cancel);
+        btnCancel.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                finish();
+            }
+        });
+
+        // Do not show soft keyboard by default
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+    }
+}

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

@@ -0,0 +1,130 @@
+package net.osmtracker.activity;
+
+import android.app.Activity;
+import android.content.pm.ActivityInfo;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import com.android.volley.AuthFailureError;
+import com.android.volley.Request;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.JsonObjectRequest;
+import com.android.volley.toolbox.Volley;
+
+import net.osmtracker.GitHubUser;
+import net.osmtracker.R;
+import net.osmtracker.db.DbGitHubUser;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class GitHubNewFork extends Activity {
+
+    EditText editTextRootUsername, editTextRootRepo;
+    private String BaseURL = "https://api.github.com";
+    GitHubUser gitHubUser;
+    private String newForkFullName;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.git_create_fork);
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+
+        DbGitHubUser dbGitHubUser = new DbGitHubUser(GitHubNewFork.this);
+        gitHubUser = dbGitHubUser.getUser();
+
+        editTextRootUsername = findViewById(R.id.git_username_to_fork_editText_user);
+        editTextRootRepo = findViewById(R.id.git_repo_to_fork_editText_name);
+
+        editTextRootUsername.setHint("Usuario raíz del repositorio");
+        editTextRootRepo.setHint("Nombre del repositorio raíz");
+
+        final Button btnCreate = (Button) findViewById(R.id.git_create_newfork_btn_ok);
+        btnCreate.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                createNewFork();
+                Toast.makeText(GitHubNewFork.this, R.string.successfully_created, Toast.LENGTH_SHORT).show();
+                finish();
+
+            }
+        });
+
+
+        final Button btnCancel = (Button) findViewById(R.id.git_back_newfork_btn_cancel);
+        btnCancel.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                finish();
+            }
+        });
+
+        // Do not show soft keyboard by default
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+    }
+
+    private void createNewFork() {
+        String fullURL = getBaseURL() + "/repos/"+ editTextRootUsername.getText().toString().trim() +"/"+ editTextRootRepo.getText().toString().trim() +"/forks?name=fork";
+
+        JsonObjectRequest  postResquest= new JsonObjectRequest(
+                Request.Method.POST,
+                fullURL,
+                null,
+                new Response.Listener<JSONObject>() {
+                    @Override
+                    public void onResponse(JSONObject response) {
+                        try {
+                            setNewForkFullName(response.getString("full_name"));
+                            Toast.makeText(GitHubNewFork.this, R.string.successfully_created, Toast.LENGTH_SHORT).show();
+                        } catch (JSONException e) {
+                            Toast.makeText(GitHubNewFork.this, R.string.error_creating, Toast.LENGTH_SHORT).show();
+                            e.printStackTrace();
+                        }
+                    }
+                }, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+
+            }
+        }){
+            @Override
+            public Map getHeaders() throws AuthFailureError
+            {
+                HashMap headers = new HashMap();
+                headers.put("Authorization", "Bearer " + gitHubUser.getToken());
+                return headers;
+            }
+
+        };
+        Volley.newRequestQueue(this).add(postResquest);
+    }
+
+    public String getBaseURL() {
+        return BaseURL;
+    }
+
+    public void setBaseURL(String baseURL) {
+        BaseURL = baseURL;
+    }
+
+    public String getNewForkFullName() {
+        return newForkFullName;
+    }
+
+    public void setNewForkFullName(String newForkFullName) {
+        this.newForkFullName = newForkFullName;
+    }
+}