Skip to content

Support for custom CalDav servers #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simonepsp wants to merge 1 commit into
base: dailyview
Choose a base branch
from
Open

Support for custom CalDav servers #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ACalDAV/res/values-da/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">Gem</string>
<string name="today_label">I dag</string>
<string name="location">Placering</string>
<string name="custom_server_label">Server (valgfri)</string>
<string name="login_btn_label">> Login</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,7 @@
<string name="save_label">Speichern</string>
<string name="today_label">Heute</string>
<string name="location">Standort</string>
<string name="custom_server_label">Server (optional)</string>
<string name="login_btn_label">> Anmelden</string>

</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-el/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">Αποθήκευση</string>
<string name="today_label">Σήμερα</string>
<string name="location">Τοποθεσία</string>
<string name="custom_server_label">Διακομιστής (προαιρετικός)</string>
<string name="login_btn_label">> Σύνδεση</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">Guardar</string>
<string name="today_label">Hoy</string>
<string name="location">Ubicación</string>
<string name="custom_server_label">Servidor (opcional)</string>
<string name="login_btn_label">> Inicio de sesión</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-fi/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">Tallenna</string>
<string name="today_label">Tänään</string>
<string name="location">Sijainti</string>
<string name="custom_server_label">Palvelin (valinnainen)</string>
<string name="login_btn_label">> Kirjautuminen</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">Sauvegarder</string>
<string name="today_label">Aujourd\'hui</string>
<string name="location">Localisation</string>
<string name="custom_server_label">Serveur (optionnel)</string>
<string name="login_btn_label">> Connexion</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-it/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,6 @@
<string name="save_label">Salva</string>
<string name="today_label">Oggi</string>
<string name="location">Posizione</string>
<string name="custom_server_label">Server (opzionale)</string>
<string name="login_btn_label">> Accedi</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-iw/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@
<string name="today_label">היום</string>
<string name="location">מקום</string>
<string name="no_title">(ללא כותרת)</string>
<string name="custom_server_label">שרת (אופציונלי)</string>
<string name="login_btn_label">> התחבר</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-ja/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">保存</string>
<string name="today_label">今日</string>
<string name="location">場所</string>
<string name="custom_server_label">サーバー (オプション)</string>
<string name="login_btn_label">> ログイン</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-nb-rNO/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">Lagre</string>
<string name="today_label">I dag</string>
<string name="location">Sted</string>
<string name="custom_server_label">Server (valgfritt)</string>
<string name="login_btn_label">> Logg inn</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-nl/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">Opslaan</string>
<string name="today_label">Vandaag</string>
<string name="location">Plaats</string>
<string name="custom_server_label">Server (optioneel)</string>
<string name="login_btn_label">> Inloggen</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-no/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">Lagre</string>
<string name="today_label">I dag</string>
<string name="location">Sted</string>
<string name="custom_server_label">Server (valgfritt)</string>
<string name="login_btn_label">> Logg inn</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">Сохранить</string>
<string name="today_label">Сегодня</string>
<string name="location">Местоположение</string>
<string name="custom_server_label">Сервер (необязательно)</string>
<string name="login_btn_label">> Вход в систему</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values-sv/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@
<string name="save_label">Spara</string>
<string name="today_label">Idag</string>
<string name="location">Plats</string>
<string name="custom_server_label">Server (valfritt)</string>
<string name="login_btn_label">> Inloggning</string>
</resources>
2 changes: 2 additions & 0 deletions ACalDAV/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@

<string name="location">Location</string>
<string name="no_title">(No title)</string>
<string name="custom_server_label">Server (optional)</string>
<string name="login_btn_label">> Login</string>


</resources>
22 changes: 20 additions & 2 deletions ACalDAV/src/com/android/common/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,17 @@ protected void onCreate(Bundle savedInstanceState) {
mPosition = getIntent().getIntExtra("position", 0);
mName = getIntent().getStringExtra("name");
mValue = getIntent().getStringExtra("value");

if (mValue == null) {
if ((mPosition == 0 && !getString(R.string.email_label).equals(mName)) ||
(mPosition == 1 && !getString(R.string.password_label).equals(mName))) {
mValue = mName;
} else if (mPosition == 1 && !getString(R.string.password_label).equals(mName)) {
mValue = mName;
} else if (mPosition == 2 && !getString(R.string.custom_server_label).equals(mName)) {
mValue = mName;
}

}

mRcContent = findViewById(R.id.rv_content_login);
Expand Down Expand Up @@ -224,12 +228,16 @@ public void onBindViewHolder(@NonNull final MyHolder holder, int position) {
requestFocus(mSaveText);
} else if (position == 1) {
mLoginText = holder.mView.findViewById(R.id.login_text);
mLoginText.setText(mPosition == 0 ? getString(R.string.email_label) : getString(R.string.password_label));
mInputText = holder.mView.findViewById(R.id.login_edit);
if (mPosition == 0) {
mLoginText.setText(getString(R.string.email_label));
mInputText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
} else if (mPosition == 1) {
mLoginText.setText(getString(R.string.password_label));
mInputText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
} else if (mPosition == 2) {
mLoginText.setText(getString(R.string.custom_server_label));
mInputText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
}
mInputText.setText(mValue);
if (mValue != null && mValue.length() > 0) {
Expand Down Expand Up @@ -295,7 +303,17 @@ public void run() {
public void itemClick(View view, int position) {
if (position == 0) {
Intent intent = new Intent();
intent.putExtra("Name", mPosition == 0 ? getString(R.string.email_label) : getString(R.string.password_label));

String name = "";
if (mPosition == 0) {
name = getString(R.string.email_label);
} else if (mPosition == 1) {
name = getString(R.string.password_label);
} else if (mPosition == 2) {
name = getString(R.string.custom_server_label);
}

intent.putExtra("Name", name);
intent.putExtra("Save", mInputText.getText().toString());
setResult(0, intent);
finish();
Expand Down
10 changes: 9 additions & 1 deletion ACalDAV/src/com/aphy/caldavsyncadapter/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,12 @@
public interface Constants {

String USER_DATA_TRUST_ALL_KEY = "USER_DATA_TRUSTALL_KEY";
String INVALID_CREDENTIALS_CHECK="CREDENTIALS_CHECK";}
String INVALID_CREDENTIALS_CHECK = "CREDENTIALS_CHECK";

String APOSTROPHY_DAV_URL = "https://dav.aphy.app";

Boolean DEBUG = false;
String DEBUG_SERVER = "http://10.0.2.2:5232/test/f77a0cf2-de01-9ce3-0b31-3d067b740bf9/";
String DEBUG_USER = "test";
String DEBUG_PASSWORD = "hello";
}
18 changes: 17 additions & 1 deletion ACalDAV/src/com/aphy/caldavsyncadapter/android/entities/AccountName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
package com.aphy.caldavsyncadapter.android.entities;

import com.aphy.caldavsyncadapter.Constants;

import java.util.Objects;

public class AccountName {
public static String AccountName = "AccountName";
public static String Password = "Password";

public static String ServerURL = "ServerUrl";

private String mAccountName;
private String mPassword;

private String mServerURL;

public String getAccountName() {
return mAccountName;
}
Expand All @@ -21,10 +27,18 @@ public String getPassword() {
return mPassword;
}

public String getServerURL() {
return mServerURL;
}

public void setPassword(String password) {
this.mPassword = password;
}

public void setServerURL(String serverURL) {
this.mServerURL = serverURL;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
Expand All @@ -35,19 +49,21 @@ public boolean equals(Object o) {

@Override
public int hashCode() {
return Objects.hash(mAccountName, mPassword);
return Objects.hash(mAccountName, mPassword, mServerURL);
}

@Override
public String toString() {
return "AccountName{" +
"mAccountName='" + mAccountName + '\'' +
", mPassword='" + mPassword + '\'' +
", mServerURL='" + mServerURL + '\'' +
'}';
}

public void clearAccountInfo() {
mAccountName = "";
mPassword = "";
mServerURL = "";
}
}
Loading