Skip to content

Commit bc925e1

Browse files
author
Gregor Santner
committed
Release v0.2.0
1 parent e95082c commit bc925e1

File tree

14 files changed

+94
-88
lines changed

14 files changed

+94
-88
lines changed

‎CONTRIBUTORS.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
Abhijith Balan (abhijithb21 AT openmailbox DOT org): Malayalam translation
1212
Airon90 (https://diasp.eu/u/airon90): Italian translation
1313
Gaukler Faun (https://github.com/scoute-dich): Diaspora Native WebApp additions
14-
Martín Vukovic (martinvukovic@protonmail.com): Diaspora Native WebApp
15-
Paweł Szymon Kosiński (pskosinski): Polish translation
14+
Martín Vukovic (martinvukovic AT protonmail DOT com): Diaspora Native WebApp
15+
Nacho Fernández (nacho_f AT joindiaspora DOT com): Spanish translation
16+
pskosinski (email AT pskosinski DOT pl): Polish translation
1617
SansPseudoFix (https://github.com/SansPseudoFix): French translation

‎README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,3 @@ Diaspora for Android requires access to the Internet and to external storage to
4141
## Maintainers
4242
- gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.github.io), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))
4343
- vanitasvitae ([GitHub](https://github.com/vanitasvitae), [Diaspora](https://pod.geraspora.de/people/bbd7af90fbec013213e34860008dbc6c))
44-
45-
## Acknowledgements
46-
- We took some inspiration and code from [LeafPic](https://github.com/HoraApps/LeafPic), big thanks to Donald Shtjefni and the LeafPic Team!

‎app/build.gradle

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ android {
99
applicationId "com.github.dfa.diaspora_android"
1010
minSdkVersion 17
1111
targetSdkVersion 24
12-
versionCode 8
13-
versionName "0.1.6-next"
12+
versionCode 9
13+
versionName "0.2.0"
1414
setProperty("archivesBaseName", "diasporaAndroid__${versionName}__")
1515

16-
vectorDrawables.useSupportLibrary=true
16+
vectorDrawables.useSupportLibrary = true
1717
}
1818
buildTypes {
1919
release {
@@ -27,10 +27,10 @@ android {
2727
}
2828
}
2929

30+
// Additional repositories
3031
repositories {
3132
maven {
32-
//Color picker
33-
url "http://dl.bintray.com/dasar/maven"
33+
url "http://dl.bintray.com/dasar/maven" //Color picker
3434
}
3535
}
3636

@@ -44,23 +44,32 @@ dependencies {
4444

4545
// Android standard libs
4646
compile 'com.android.support:appcompat-v7:24.2.1'
47-
compile 'com.android.support:design:24.1.0' //Don't update. Broken up to 24.2.1
47+
compile 'com.android.support:design:24.1.0' //Don't update. Broken up to 25.0.0
4848
compile 'com.android.support:support-v4:24.2.1'
49-
compile "com.android.support:customtabs:24.2.1"
49+
compile 'com.android.support:customtabs:24.2.1'
5050

5151
// More libraries
5252
compile 'com.jakewharton:butterknife:8.0.1'
5353
compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
5454
compile 'info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1'
55-
compile(group: 'uz.shift', name: 'colorpicker', version: '0.5', ext: 'aar') //Color picker
55+
compile(group: 'uz.shift', name: 'colorpicker', version: '0.5', ext: 'aar')
5656
apt 'com.jakewharton:butterknife-compiler:8.0.1'
5757
}
5858

59+
// #####################
60+
// Groovy Coding Area
61+
// #####################
62+
final String RAW_DIR = "app/src/main/res/raw"
63+
final String[] ROOT_TO_RAW_COPYFILES = ["README.md", "LICENSE.md", "CHANGELOG.md", "CONTRIBUTORS.txt"]
64+
final String PODLIST_URL = 'https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/podList/podlist.json'
65+
final String PODLIST_PATH = "${RAW_DIR}/podlist.json"
5966

67+
// Called before building
6068
task copyRepoFiles(type: Copy) {
61-
String[] copyFiles = ["README.md", "LICENSE.md", "CHANGELOG.md"]
62-
from rootProject.files(copyFiles)
63-
into 'src/main/res/raw'
69+
70+
// Copy files over to raw dir
71+
from rootProject.files(ROOT_TO_RAW_COPYFILES)
72+
into RAW_DIR.replaceFirst("app/", "")
6473
rename { String fileName ->
6574
fileName.replace(fileName, fileName.toLowerCase())
6675
}
@@ -76,29 +85,25 @@ task copyRepoFiles(type: Copy) {
7685
}
7786
}
7887

79-
// Download Podlist
80-
final String PODLIST_PATH = "app/src/main/res/raw/podlist.json"
81-
final String PODLIST_URL = 'https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/podList/podlist.json'
88+
// Download PodList
8289
downloadFile(PODLIST_PATH, PODLIST_URL, false)
8390

84-
// Do if we build in release (signed apk) mode
85-
android.applicationVariants.all { v ->
86-
if (v.buildType.name == "release"){
87-
v.assemble.doFirst {
88-
downloadFile(PODLIST_PATH, PODLIST_URL, true)
89-
}
91+
// Application variants
92+
android.applicationVariants.all { v ->
93+
// Do if we build in release (signed apk) mode
94+
if (v.buildType.name == "release") {
95+
downloadFile(PODLIST_PATH, PODLIST_URL, true)
9096
}
9197
}
9298
}
9399

94-
def downloadFile(filePath, url, downloadIfExists ) {
100+
// Downloads a file
101+
def downloadFile(filePath, url, downloadIfExists) {
95102
def f = new File(filePath)
96-
if (f.exists() && downloadIfExists){
97-
f.delete();
98-
}
103+
f.exists() && downloadIfExists && f.delete();
99104
if (!f.exists()) {
100-
new URL(url).withInputStream{ i -> f.withOutputStream{ it << i }}
105+
new URL(url).withInputStream { i -> f.withOutputStream { it << i } }
101106
}
102107
}
103108

104-
tasks.copyRepoFiles.execute()
109+
tasks.copyRepoFiles.execute()

‎app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,9 @@
7575
<data android:host="despora.de" android:scheme="https" />
7676
<data android:host="sechat.org" android:scheme="https" />
7777
<data android:host="sechatqpscuj2npx.onion" android:scheme="http" />
78-
<data android:host="austriapod.at" android:scheme="https" />
7978
<data android:host="berdaguermontes.eu" android:scheme="https" />
8079
<data android:host="berlinspora.de" android:scheme="https" />
81-
<data android:host="canfly.org" android:scheme="https" />
8280
<data android:host="community.kanalinseln.de" android:scheme="https" />
83-
<data android:host="cryptospora.net" android:scheme="https" />
8481
<data android:host="d.consumium.org" android:scheme="https" />
8582
<data android:host="dia.manuelbichler.at" android:scheme="https" />
8683
<data android:host="dia.myocastor.de" android:scheme="https" />
@@ -99,17 +96,14 @@
9996
<data android:host="diaspora.com.ar" android:scheme="https" />
10097
<data android:host="diaspora.deadhexagon.com" android:scheme="https" />
10198
<data android:host="diaspora.digi-merc.org" android:scheme="https" />
102-
<data android:host="diaspora.digitalismus.org" android:scheme="https" />
10399
<data android:host="diaspora.dorf-post.de" android:scheme="https" />
104100
<data android:host="diaspora.espiritolivre.org" android:scheme="https" />
105-
<data android:host="diaspora.fr33.co" android:scheme="https" />
106101
<data android:host="diaspora.horwood.biz" android:scheme="https" />
107102
<data android:host="diaspora.hzsogood.net" android:scheme="https" />
108103
<data android:host="diaspora.kapper.net" android:scheme="https" />
109104
<data android:host="diaspora.koehn.com" android:scheme="https" />
110105
<data android:host="diaspora.kosebamse.com" android:scheme="https" />
111106
<data android:host="diaspora.lebarjack.com" android:scheme="https" />
112-
<data android:host="diaspora.mazi.tk" android:scheme="https" />
113107
<data android:host="diaspora.microdata.co.uk" android:scheme="https" />
114108
<data android:host="diaspora.moosje.nl" android:scheme="https" />
115109
<data android:host="diaspora.net.gr" android:scheme="https" />
@@ -122,101 +116,68 @@
122116
<data android:host="diaspora.punkbeer.me" android:scheme="https" />
123117
<data android:host="diaspora.raven-ip.com" android:scheme="https" />
124118
<data android:host="diaspora.retrodigital.net" android:scheme="https" />
125-
<data android:host="diaspora.sceal.ie" android:scheme="https" />
126-
<data android:host="diaspora.schrauger.com" android:scheme="https" />
127-
<data android:host="diaspora.slowb.ro" android:scheme="https" />
128119
<data android:host="diaspora.soh.re" android:scheme="https" />
129120
<data android:host="diaspora.subsignal.org" android:scheme="https" />
130121
<data android:host="diaspora.trash-talk.de" android:scheme="https" />
131122
<data android:host="diaspora.u4u.org" android:scheme="https" />
132-
<data android:host="diaspora.undernet.uy" android:scheme="https" />
133123
<data android:host="diaspora.unixcorn.org" android:scheme="https" />
134-
<data android:host="diaspora.weenmebrown.com" android:scheme="https" />
135-
<data android:host="diaspora.xcelor8.com" android:scheme="https" />
136124
<data android:host="diasporabr.com.br" android:scheme="https" />
137125
<data android:host="diasporabrazil.org" android:scheme="https" />
138-
<data android:host="diasporanet.tk" android:scheme="https" />
139126
<data android:host="diasporapr.tk" android:scheme="https" />
140-
<data android:host="diasporausa.com" android:scheme="https" />
141127
<data android:host="diasporing.ch" android:scheme="https" />
142-
<data android:host="dissociateduse.rs" android:scheme="https" />
143128
<data android:host="distributed.chat" android:scheme="https" />
144-
<data android:host="eat.egregious.ly" android:scheme="https" />
145-
<data android:host="ege.land" android:scheme="https" />
146129
<data android:host="espora.com.es" android:scheme="https" />
147130
<data android:host="espora.social" android:scheme="https" />
148131
<data android:host="failure.net" android:scheme="https" />
149132
<data android:host="flokk.no" android:scheme="https" />
150133
<data android:host="freehuman.fr" android:scheme="https" />
151-
<data android:host="friendica.tk" android:scheme="https" />
152-
<data android:host="home.enslaver.net" android:scheme="https" />
153-
<data android:host="idoru.pl" android:scheme="https" />
154134
<data android:host="iliketoast.net" android:scheme="https" />
155135
<data android:host="jons.gr" android:scheme="https" />
156136
<data android:host="kapok.se" android:scheme="https" />
157137
<data android:host="karmasphe.re" android:scheme="https" />
158-
<data android:host="kosmospora.net" android:scheme="https" />
159138
<data android:host="laba.mba" android:scheme="https" />
160139
<data android:host="liberdade.digital" android:scheme="https" />
161-
<data android:host="libertypod.org" android:scheme="https" />
162140
<data android:host="librenet.co.za" android:scheme="https" />
163141
<data android:host="librenet.gr" android:scheme="https" />
164-
<data android:host="londor.be" android:scheme="https" />
165142
<data android:host="misamigos.online" android:scheme="https" />
166143
<data android:host="mondiaspora.net" android:scheme="https" />
167144
<data android:host="networkwizard.de" android:scheme="https" />
168145
<data android:host="nx-pod.de" android:scheme="https" />
169-
<data android:host="parteidervernunft.com" android:scheme="https" />
170146
<data android:host="pe.spbstu.ru" android:scheme="https" />
171147
<data android:host="pod.4ray.co" android:scheme="https" />
172148
<data android:host="pod.8n1.org" android:scheme="https" />
173149
<data android:host="pod.alterworld.info" android:scheme="https" />
174150
<data android:host="pod.asap-soft.com" android:scheme="https" />
175151
<data android:host="pod.cannyfoxx.me" android:scheme="https" />
176-
<data android:host="pod.comin.dk" android:scheme="https" />
177152
<data android:host="pod.cyberdungeon.de" android:scheme="https" />
178153
<data android:host="pod.dapor.net" android:scheme="https" />
179154
<data android:host="pod.datenknoten.me" android:scheme="https" />
180155
<data android:host="pod.diaspora.software" android:scheme="https" />
181156
<data android:host="pod.dirkomatik.de" android:scheme="https" />
182157
<data android:host="pod.disroot.org" android:scheme="https" />
183-
<data android:host="pod.dobs.at" android:scheme="https" />
184-
<data android:host="pod.dragondreaming.de" android:scheme="https" />
185-
<data android:host="pod.gaialabs.ch" android:scheme="https" />
186158
<data android:host="pod.gedankenausbruch.com" android:scheme="https" />
187159
<data android:host="pod.gleisnetze.de" android:scheme="https" />
188160
<data android:host="pod.goodsharing.at" android:scheme="https" />
189161
<data android:host="pod.hashtagueule.fr" android:scheme="https" />
190-
<data android:host="pod.hfrc.de" android:scheme="https" />
191162
<data android:host="pod.hoizi.net" android:scheme="https" />
192-
<data android:host="pod.infoduv.fr" android:scheme="https" />
193163
<data android:host="pod.itabs.nl" android:scheme="https" />
194164
<data android:host="pod.jpope.org" android:scheme="https" />
195-
<data android:host="pod.kepow.org" android:scheme="https" />
196165
<data android:host="pod.liebeleu.de" android:scheme="https" />
197-
<data android:host="pod.neikos.me" android:scheme="https" />
198166
<data android:host="pod.nomorestars.com" android:scheme="https" />
199167
<data android:host="pod.orkz.net" android:scheme="https" />
200168
<data android:host="pod.ponk.pink" android:scheme="https" />
201169
<data android:host="pod.promedol.com" android:scheme="https" />
202170
<data android:host="pod.psynet.su" android:scheme="https" />
203-
<data android:host="pod.readme.is" android:scheme="https" />
204-
<data android:host="pod.richtig.koeln" android:scheme="https" />
205171
<data android:host="pod.roocita.com" android:scheme="https" />
206-
<data android:host="pod.ros-it.ch" android:scheme="https" />
207-
<data android:host="pod.sccn.club" android:scheme="https" />
208172
<data android:host="pod.sertelon.fr" android:scheme="https" />
209-
<data android:host="pod.shouldit.work" android:scheme="https" />
210173
<data android:host="pod.storel.li" android:scheme="https" />
211174
<data android:host="pod.tchncs.de" android:scheme="https" />
212175
<data android:host="pod.thomasdalichow.de" android:scheme="https" />
213-
<data android:host="pod.undreaming.org" android:scheme="https" />
214176
<data android:host="pod.volt.io" android:scheme="https" />
215177
<data android:host="podbay.net" android:scheme="https" />
216178
<data android:host="poddery.com" android:scheme="https" />
217179
<data android:host="podricing.pw" android:scheme="https" />
218180
<data android:host="pubpod.alqualonde.org" android:scheme="https" />
219-
<data android:host="realms.the-wizard.co.za" android:scheme="https" />
220181
<data android:host="revreso.de" android:scheme="https" />
221182
<data android:host="ruhrspora.de" android:scheme="https" />
222183
<data android:host="russiandiaspora.org" android:scheme="https" />
@@ -227,7 +188,6 @@
227188
<data android:host="social.elaon.de" android:scheme="https" />
228189
<data android:host="social.lanham.id.au" android:scheme="https" />
229190
<data android:host="social.mbuto.me" android:scheme="https" />
230-
<data android:host="social.sum7.de" android:scheme="https" />
231191
<data android:host="socializer.cc" android:scheme="https" />
232192
<data android:host="spora.zone" android:scheme="https" />
233193
<data android:host="subvillage.de" android:scheme="https" />
@@ -236,19 +196,16 @@
236196
<data android:host="therealtalk.org" android:scheme="https" />
237197
<data android:host="thinkopen.net" android:scheme="https" />
238198
<data android:host="tippentappen.de" android:scheme="https" />
239-
<data android:host="united.zkp.fr" android:scheme="https" />
240199
<data android:host="whatsnewz.com" android:scheme="https" />
241200
<data android:host="wk3.org" android:scheme="https" />
242201
<data android:host="www.datataffel.dk" android:scheme="https" />
243202
<data android:host="www.diasporaix.de" android:scheme="https" />
244203
<data android:host="diaspora.hofud.com" android:scheme="https" />
245204
<data android:host="diaspora.softwarelivre.org" android:scheme="https" />
246205
<data android:host="confetticake.club" android:scheme="https" />
247-
<data android:host="diaspora.mike-jones.me.uk" android:scheme="https" />
248206
<data android:host="diaspote.org" android:scheme="https" />
249207
<data android:host="diaspora.zone" android:scheme="https" />
250208
<data android:host="pod.userzap.de" android:scheme="https" />
251-
<data android:host="share.naturalnews.com" android:scheme="https" />
252209
<!--@@@ PODLIST END-->
253210
</intent-filter>
254211

‎app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import android.support.design.widget.AppBarLayout;
3535
import android.support.design.widget.NavigationView;
3636
import android.support.design.widget.Snackbar;
37-
import android.support.v4.app.Fragment;
3837
import android.support.v4.app.FragmentManager;
3938
import android.support.v4.content.LocalBroadcastManager;
4039
import android.support.v4.view.GravityCompat;
@@ -462,7 +461,7 @@ public void run() {
462461
@Override
463462
public void run() {
464463
ContextMenuWebView wv = ((DiasporaStreamFragment) getFragment(DiasporaStreamFragment.TAG)).getWebView();
465-
if(wv != null) {
464+
if (wv != null) {
466465
wv.clearCache(true);
467466
}
468467
}
@@ -486,7 +485,7 @@ public void run() {
486485
return;
487486
}
488487
//Catch split screen recreation
489-
if(action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) {
488+
if (action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) {
490489
return;
491490
}
492491

@@ -581,7 +580,7 @@ protected void onResume() {
581580
LocalBroadcastManager.getInstance(this).registerReceiver(brOpenExternalLink, new IntentFilter(ACTION_OPEN_EXTERNAL_URL));
582581
invalidateOptionsMenu();
583582
this.appSettings = getAppSettings();
584-
if(appSettings.isIntellihideToolbars()) {
583+
if (appSettings.isIntellihideToolbars()) {
585584
enableToolbarHiding();
586585
} else {
587586
disableToolbarHiding();

‎app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ protected void onStop() {
131131
@Override
132132
public void onBackPressed() {
133133
ThemedPreferenceFragment top = getTopFragment();
134-
if(top != null && top.getFragmentTag().equals(SettingsFragmentProxy.TAG)) {
134+
if (top != null && top.getFragmentTag().equals(SettingsFragmentProxy.TAG)) {
135135
ProxyHandler.ProxySettings newProxySettings = getAppSettings().getProxySettings();
136-
if(oldProxySettings.isEnabled() && !newProxySettings.isEnabled()) {
136+
if (oldProxySettings.isEnabled() && !newProxySettings.isEnabled()) {
137137
Toast.makeText(this, R.string.toast__proxy_disabled__restart_required, Toast.LENGTH_LONG).show();
138138
}
139139
}

0 commit comments

Comments
 (0)